summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-02-19 12:48:37 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2017-02-19 12:52:47 +0000
commiteb5ff9547395e9e40536474fa8005ade25528684 (patch)
treebd261b146c7614888c24bfce7ad366b59bac843e
parentdev-haskell/network: don't persist LDFLAGS into package db, bug #609624 (diff)
downloadgentoo-eb5ff9547395e9e40536474fa8005ade25528684.tar.gz
gentoo-eb5ff9547395e9e40536474fa8005ade25528684.tar.bz2
gentoo-eb5ff9547395e9e40536474fa8005ade25528684.zip
dev-haskell/x11: don't persist LDFLAGS into package db, bug #609624
Reported-by: Helmut Jarausch Bug: https://bugs.gentoo.org/609624 Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch12
-rw-r--r--dev-haskell/x11/x11-1.8-r1.ebuild (renamed from dev-haskell/x11/x11-1.8.ebuild)2
2 files changed, 14 insertions, 0 deletions
diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
new file mode 100644
index 000000000000..f1d5c179036e
--- /dev/null
+++ b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
@@ -0,0 +1,12 @@
+Don't persist LDFLAGS into package database.
+
+https://bugs.gentoo.org/609624
+diff --git a/X11.buildinfo.in b/X11.buildinfo.in
+index 6925939..6a18b58 100644
+--- a/X11.buildinfo.in
++++ b/X11.buildinfo.in
+@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
+ cc-options: @X_CFLAGS@ @CPPFLAGS@
+-ld-options: @X_LIBS@ @LDFLAGS@
++ld-options: @X_LIBS@
+ extra-libraries: @EXTRA_LIBRARIES@
diff --git a/dev-haskell/x11/x11-1.8.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild
index 50622790aa32..13059094fde2 100644
--- a/dev-haskell/x11/x11-1.8.ebuild
+++ b/dev-haskell/x11/x11-1.8-r1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
"
+PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
+
S="${WORKDIR}/${MY_P}"
src_configure() {