From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B76511384B4 for ; Fri, 27 Nov 2015 13:07:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42E3321C0E6; Fri, 27 Nov 2015 13:07:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA70721C0E6 for ; Fri, 27 Nov 2015 13:07:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DE56340775 for ; Fri, 27 Nov 2015 13:07:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10AEE612 for ; Fri, 27 Nov 2015 13:07:08 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1448629551.f6c373eb122810a19b5b38fffba210134da5b748.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/csound/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/csound/csound-6.05.0.ebuild media-sound/csound/files/csound-6.05-underlinking.patch X-VCS-Directories: media-sound/csound/files/ media-sound/csound/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: f6c373eb122810a19b5b38fffba210134da5b748 X-VCS-Branch: master Date: Fri, 27 Nov 2015 13:07:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: afecbc66-f9e8-4f1d-b81c-69502812d5ae X-Archives-Hash: effb216acfe868a8098c50abc9562ac2 commit: f6c373eb122810a19b5b38fffba210134da5b748 Author: Sergey Popov gentoo org> AuthorDate: Fri Nov 27 13:05:51 2015 +0000 Commit: Sergey Popov gentoo org> CommitDate: Fri Nov 27 13:05:51 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c373eb media-sound/csound: fix underlinking on libm Reported-by: Toralf Förster gmx.de> Gentoo-Bug: 566064 Package-Manager: portage-2.2.23 media-sound/csound/csound-6.05.0.ebuild | 3 ++ .../csound/files/csound-6.05-underlinking.patch | 53 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/media-sound/csound/csound-6.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild index 02e99b9..1249920 100644 --- a/media-sound/csound/csound-6.05.0.ebuild +++ b/media-sound/csound/csound-6.05.0.ebuild @@ -94,6 +94,9 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/csound-6.05-python.patch + # bug #566064 + epatch "${FILESDIR}"/csound-6.05-underlinking.patch + sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \ -e '/-O3/d' \ -i CMakeLists.txt || die diff --git a/media-sound/csound/files/csound-6.05-underlinking.patch b/media-sound/csound/files/csound-6.05-underlinking.patch new file mode 100644 index 0000000..eac83f2 --- /dev/null +++ b/media-sound/csound/files/csound-6.05-underlinking.patch @@ -0,0 +1,53 @@ +commit a4b1930b506274e328ee26cd6287965cb496062b +Author: Steven Yi +Date: Mon Sep 28 18:21:22 2015 -0400 + + modified make_utility and targets for csound-bin and mixer-bin to use add libm for linking when on Linux [fixes #526] + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2b16079..18a6ad1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -97,6 +97,10 @@ endfunction(make_executable) + function(make_utility name srcs) + make_executable(${name} "${srcs}" "${CSOUNDLIB}") + add_dependencies(${name} ${CSOUNDLIB}) ++ ++ if(LINUX) ++ target_link_libraries(${name} m) ++ endif() + endfunction() + + +diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt +index d0e3a21..b31f37a 100644 +--- a/frontends/CMakeLists.txt ++++ b/frontends/CMakeLists.txt +@@ -43,6 +43,9 @@ endfunction(make_plugin_frontend) + + # We need a different name to avoid clashes with float libcsound + make_executable(csound-bin "${CS_MAIN_SRCS}" "${CSOUNDLIB}" csound) ++if(LINUX) ++ target_link_libraries(csound-bin m) ++endif() + + message(STATUS "Building csLadspa") + +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 25089cc..ebf0aa5 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -23,9 +23,11 @@ if(BUILD_UTILITIES) + make_utility(hetro het_main.c) + make_utility(lpanal lpc_main.c) + make_utility(lpc_export lpcx_main.c) +- target_link_libraries(lpc_export m) + make_utility(lpc_import lpci_main.c) +- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) ++ if(LINUX) ++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) ++ endif() ++ target_link_libraries(mixer-bin m) + make_utility(pvanal pvc_main.c) + make_utility(pvlook pvl_main.c) + make_utility(pv_export pvx_main.c)