From 9213bd4562ec1636922d8b420bcd110f4c14e8ec Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 12 Sep 2015 01:20:26 -0400 Subject: [PATCH 1/3] sys-fs/xfsprogs: rework static flag handling #551810 The use of -static when linking causes bad rpaths when USE=-static-libs because only dynamic xfs libs are available. But we don't really want to link the programs against the static xfs libs when we have dynamic ones available. --- sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild index 35a490f370b99..45d31297c5c80 100644 --- a/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild @@ -39,15 +39,14 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-4.2.0-sharedlibs.patch + # LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled. + # Clear out -static from all flags since we want to link against dynamic xfs libs. sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ + -e "1iLLDFLAGS += $(usex static '-all-static' '')" \ include/builddefs.in || die - sed -i \ - -e '1iLLDFLAGS = -static' \ - {estimate,fsr}/Makefile || die - sed -i \ - -e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \ - $(find -name Makefile) || die + find -name Makefile -exec \ + sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} + # libdisk has broken blkid conditional checking sed -i \ From c95b207739af5d155758c4bac3d859879c974ab3 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 12 Sep 2015 07:25:28 +0200 Subject: [PATCH 2/3] media-gfx/argyllcms: Stable for HPPA (bug #559480). Package-Manager: portage-2.2.20.1 --- media-gfx/argyllcms/argyllcms-1.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/argyllcms/argyllcms-1.7.0.ebuild b/media-gfx/argyllcms/argyllcms-1.7.0.ebuild index c59a59aaf2175..32ad23468645b 100644 --- a/media-gfx/argyllcms/argyllcms-1.7.0.ebuild +++ b/media-gfx/argyllcms/argyllcms-1.7.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" +KEYWORDS="~amd64 hppa ~x86" IUSE="doc" RDEPEND=" From 54b42a8495513dc71946b9f6c4f1cb87a7611e3b Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 12 Sep 2015 07:27:38 +0200 Subject: [PATCH 3/3] dev-libs/wayland: Stable for HPPA PPC64 (bug #559758). Package-Manager: portage-2.2.20.1 --- dev-libs/wayland/wayland-1.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/wayland/wayland-1.7.0.ebuild b/dev-libs/wayland/wayland-1.7.0.ebuild index 169d14c7f9934..1cb6cdad9ca35 100644 --- a/dev-libs/wayland/wayland-1.7.0.ebuild +++ b/dev-libs/wayland/wayland-1.7.0.ebuild @@ -24,7 +24,7 @@ fi LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" IUSE="doc static-libs" RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]