zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtmidi: clean several build flags

Browse Source 
* On some build environments configure failed
* Wonder how this remained undiscovered for so long

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-08-10 23:04:20 +02:00
parent e1bb80d6a5
commit d06330e0bd
3 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
recipes-misc/recipes-multimedia/rtmidi/files/0002-configure.ac-do-not-reset-CXXFLAGS.patch Normal file
View File

@@ -0,0 +1,31 @@
From 3afd4de13c7019d7ad5ee63cb6557e18d52622ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 10 Aug 2018 15:52:36 +0200
Subject: [PATCH] configure.ac: do not reset CXXFLAGS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3f4cb0a..5049632 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ CPPFLAGS="$CPPFLAGS $cppflag"
# For debugging and optimization ... overwrite default because it has both -g and -O2
#CXXFLAGS="$CXXFLAGS $cxxflag"
-CXXFLAGS="$cxxflag"
+#CXXFLAGS="$cxxflag"
# Check compiler and use -Wall if gnu.
if [test $GXX = "yes" ;] then
--
2.14.4

35
recipes-misc/recipes-multimedia/rtmidi/files/0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch Normal file
View File

@@ -0,0 +1,35 @@
From 5034424a8e11ea05f0149f038d981e667e838267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 10 Aug 2018 16:00:27 +0200
Subject: [PATCH] configure.ac: do not add absolute prefixes to build flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 6 ------
1 file changed, 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5049632..3f7e183 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,12 +66,6 @@ AC_ARG_ENABLE(debug,
[AC_SUBST( cppflag, [-D__RTMIDI_DEBUG__] ) AC_SUBST( cxxflag, [-g] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)],
[AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
-# Set paths if prefix is defined
-if test "x$prefix" != "x" && test "x$prefix" != "xNONE"; then
- LIBS="$LIBS -L$prefix/lib"
- CPPFLAGS="$CPPFLAGS -I$prefix/include/rtmidi"
-fi
-
# For -I and -D flags
CPPFLAGS="$CPPFLAGS $cppflag"
--
2.14.4

2
recipes-misc/recipes-multimedia/rtmidi/rtmidi_3.0.0.bb
View File

@@ -12,6 +12,8 @@ PACKAGECONFIG[jack] = "--with-jack,--without-jack,jack"
SRC_URI = " \
http://www.music.mcgill.ca/~gary/${BPN}/release/${BPN}-${PV}.tar.gz \
file://0001-configure.ac-do-not-run-temp-binary-in-cross-envirno.patch \
file://0002-configure.ac-do-not-reset-CXXFLAGS.patch \
file://0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch \
"
SRC_URI[md5sum] = "d22e3a5dee972fa0725c420923f1ce65"
SRC_URI[sha256sum] = "d6ee3620236904a1067bd615ff012f1064cbfb389b09ac0b847bbcbd0f565214"