From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4046138330 for ; Sat, 24 Sep 2016 12:44:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F3FBE08D2; Sat, 24 Sep 2016 12:44:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B73EE08BA for ; Sat, 24 Sep 2016 12:44:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43CC1340B1F for ; Sat, 24 Sep 2016 12:44:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 945192494 for ; Sat, 24 Sep 2016 12:44:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1474721067.430460192fa2d64c196a18b34d386d4f244f5755.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch sci-mathematics/octave/octave-4.0.3.ebuild X-VCS-Directories: sci-mathematics/octave/ sci-mathematics/octave/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 430460192fa2d64c196a18b34d386d4f244f5755 X-VCS-Branch: master Date: Sat, 24 Sep 2016 12:44:35 +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: 8688e18c-c0ea-495d-9d64-b9d67275441d X-Archives-Hash: f5bead396874884b13c97bb9bc83bb98 commit: 430460192fa2d64c196a18b34d386d4f244f5755 Author: David Seifert gentoo org> AuthorDate: Sat Sep 24 12:43:45 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Sep 24 12:44:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43046019 sci-mathematics/octave: Fix zlib underlinking Gentoo-bug: 593670 * [QA] Add -Wl,-z,defs to LDFLAGS * Make dependency on sys-libs/zlib unconditional Package-Manager: portage-2.3.1 .../octave/files/octave-4.0.3-zlib-underlinking.patch | 13 +++++++++++++ sci-mathematics/octave/octave-4.0.3.ebuild | 14 +++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch b/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch new file mode 100644 index 00000000..7bc1187 --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.0.3-zlib-underlinking.patch @@ -0,0 +1,13 @@ +Fix underlinking caused by missing -lz link. +See also: https://bugs.gentoo.org/show_bug.cgi?id=593670 + +--- a/libinterp/corefcn/module.mk ++++ b/libinterp/corefcn/module.mk +@@ -361,6 +361,7 @@ + $(HDF5_CPPFLAGS) \ + $(LLVM_CPPFLAGS) \ + $(Z_CPPFLAGS) ++corefcn_libcorefcn_la_LIBADD = $(Z_LIBS) + + corefcn_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS) + diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild index 408fc9e..53b5c7e 100644 --- a/sci-mathematics/octave/octave-4.0.3.ebuild +++ b/sci-mathematics/octave/octave-4.0.3.ebuild @@ -54,7 +54,7 @@ RDEPEND=" sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) - zlib? ( sys-libs/zlib:0= )" + sys-libs/zlib" DEPEND="${RDEPEND} qrupdate? ( app-misc/pax-utils ) @@ -75,6 +75,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.0.3-imagemagick.patch "${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch "${FILESDIR}"/${PN}-4.0.3-ncurses-pkgconfig.patch + "${FILESDIR}"/${PN}-4.0.3-zlib-underlinking.patch ) src_prepare() { @@ -98,6 +99,9 @@ src_prepare() { } src_configure() { + # [QA] detect underlinking #593670 + append-ldflags $(test-flags-CXX -Wl,-z,defs) + # unfortunate dependency on mpi from hdf5 (bug #302621) use hdf5 && has_version sci-libs/hdf5[mpi] && \ export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 @@ -118,6 +122,7 @@ src_configure() { --disable-64 \ --disable-jit \ --enable-shared \ + --with-z \ $(use_enable static-libs static) \ $(use_enable doc docs) \ $(use_enable java) \ @@ -138,8 +143,7 @@ src_configure() { $(use_with sparse ccolamd) \ $(use_with sparse cholmod) \ $(use_with sparse cxsparse) \ - $(use_with X x) \ - $(use_with zlib z) + $(use_with X x) } src_compile() { @@ -160,7 +164,7 @@ src_install() { fi [[ -e test/fntests.log ]] && dodoc test/fntests.log use java && \ - java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar" - echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave + java-pkg_regjar "${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar" + echo "LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die doenvd 99octave }