| 1 |
commit: f6c373eb122810a19b5b38fffba210134da5b748 |
| 2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 27 13:05:51 2015 +0000 |
| 4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 27 13:05:51 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c373eb |
| 7 |
|
| 8 |
media-sound/csound: fix underlinking on libm |
| 9 |
|
| 10 |
Reported-by: Toralf Förster <toralf.foerster <AT> gmx.de> |
| 11 |
Gentoo-Bug: 566064 |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.23 |
| 14 |
|
| 15 |
media-sound/csound/csound-6.05.0.ebuild | 3 ++ |
| 16 |
.../csound/files/csound-6.05-underlinking.patch | 53 ++++++++++++++++++++++ |
| 17 |
2 files changed, 56 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-sound/csound/csound-6.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild |
| 20 |
index 02e99b9..1249920 100644 |
| 21 |
--- a/media-sound/csound/csound-6.05.0.ebuild |
| 22 |
+++ b/media-sound/csound/csound-6.05.0.ebuild |
| 23 |
@@ -94,6 +94,9 @@ pkg_setup() { |
| 24 |
src_prepare() { |
| 25 |
epatch "${FILESDIR}"/csound-6.05-python.patch |
| 26 |
|
| 27 |
+ # bug #566064 |
| 28 |
+ epatch "${FILESDIR}"/csound-6.05-underlinking.patch |
| 29 |
+ |
| 30 |
sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \ |
| 31 |
-e '/-O3/d' \ |
| 32 |
-i CMakeLists.txt || die |
| 33 |
|
| 34 |
diff --git a/media-sound/csound/files/csound-6.05-underlinking.patch b/media-sound/csound/files/csound-6.05-underlinking.patch |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..eac83f2 |
| 37 |
--- /dev/null |
| 38 |
+++ b/media-sound/csound/files/csound-6.05-underlinking.patch |
| 39 |
@@ -0,0 +1,53 @@ |
| 40 |
+commit a4b1930b506274e328ee26cd6287965cb496062b |
| 41 |
+Author: Steven Yi <stevenyi@×××××.com> |
| 42 |
+Date: Mon Sep 28 18:21:22 2015 -0400 |
| 43 |
+ |
| 44 |
+ modified make_utility and targets for csound-bin and mixer-bin to use add libm for linking when on Linux [fixes #526] |
| 45 |
+ |
| 46 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 47 |
+index 2b16079..18a6ad1 100644 |
| 48 |
+--- a/CMakeLists.txt |
| 49 |
++++ b/CMakeLists.txt |
| 50 |
+@@ -97,6 +97,10 @@ endfunction(make_executable) |
| 51 |
+ function(make_utility name srcs) |
| 52 |
+ make_executable(${name} "${srcs}" "${CSOUNDLIB}") |
| 53 |
+ add_dependencies(${name} ${CSOUNDLIB}) |
| 54 |
++ |
| 55 |
++ if(LINUX) |
| 56 |
++ target_link_libraries(${name} m) |
| 57 |
++ endif() |
| 58 |
+ endfunction() |
| 59 |
+ |
| 60 |
+ |
| 61 |
+diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt |
| 62 |
+index d0e3a21..b31f37a 100644 |
| 63 |
+--- a/frontends/CMakeLists.txt |
| 64 |
++++ b/frontends/CMakeLists.txt |
| 65 |
+@@ -43,6 +43,9 @@ endfunction(make_plugin_frontend) |
| 66 |
+ |
| 67 |
+ # We need a different name to avoid clashes with float libcsound |
| 68 |
+ make_executable(csound-bin "${CS_MAIN_SRCS}" "${CSOUNDLIB}" csound) |
| 69 |
++if(LINUX) |
| 70 |
++ target_link_libraries(csound-bin m) |
| 71 |
++endif() |
| 72 |
+ |
| 73 |
+ message(STATUS "Building csLadspa") |
| 74 |
+ |
| 75 |
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt |
| 76 |
+index 25089cc..ebf0aa5 100644 |
| 77 |
+--- a/util/CMakeLists.txt |
| 78 |
++++ b/util/CMakeLists.txt |
| 79 |
+@@ -23,9 +23,11 @@ if(BUILD_UTILITIES) |
| 80 |
+ make_utility(hetro het_main.c) |
| 81 |
+ make_utility(lpanal lpc_main.c) |
| 82 |
+ make_utility(lpc_export lpcx_main.c) |
| 83 |
+- target_link_libraries(lpc_export m) |
| 84 |
+ make_utility(lpc_import lpci_main.c) |
| 85 |
+- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) |
| 86 |
++ if(LINUX) |
| 87 |
++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) |
| 88 |
++ endif() |
| 89 |
++ target_link_libraries(mixer-bin m) |
| 90 |
+ make_utility(pvanal pvc_main.c) |
| 91 |
+ make_utility(pvlook pvl_main.c) |
| 92 |
+ make_utility(pv_export pvx_main.c) |
Archives