summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2010-08-29 18:30:50 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2010-08-29 18:30:50 +0000
commit0bdff1a015208bd2fa9661235bd1609d21769acb (patch)
treeb0a391f2b052790e53f6f8912e3f206f354dc63b /dev-lang
parentalpha/ia64/m68k/s390/sh/sparc stable wrt #329791 (diff)
downloadhistorical-0bdff1a015208bd2fa9661235bd1609d21769acb.tar.gz
historical-0bdff1a015208bd2fa9661235bd1609d21769acb.tar.bz2
historical-0bdff1a015208bd2fa9661235bd1609d21769acb.zip
Fixed build failure with forced --as-needed (bug #334403). Removed binary stripping, CFLAGS are now respected too.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/helium/ChangeLog8
-rw-r--r--dev-lang/helium/Manifest5
-rw-r--r--dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch59
-rw-r--r--dev-lang/helium/helium-1.6.ebuild5
4 files changed, 72 insertions, 5 deletions
diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index f76c2ee610fc..04c70b9788d0 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-lang/helium
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.24 2010/07/24 14:39:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.25 2010/08/29 18:30:50 slyfox Exp $
+
+ 29 Aug 2010; Sergei Trofimovich <slyfox@gentoo.org> helium-1.6.ebuild,
+ +files/helium-1.6-respect-cflags-ldflags-nostrip.patch:
+ Fixed build failure with forced --as-needed (bug #334403). Thanks to Diego
+ E. 'Flameeyes' Pettenò <flameeyes@gentoo.org> who reported it. Removed
+ binary stripping, CFLAGS are now respected too.
24 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> helium-1.6.ebuild:
Fixed build breakage against ghc-6.8+ (bug #247044). Thanks to Diego E.
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index 32c5d2be4e1e..545619d97d11 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,6 +1,7 @@
AUX helium-1.1-readline.patch 1710 RMD160 4254f4a102623bfe0fd2883937706abb83b5e61a SHA1 890f05fd7f02cd939e668d0df6c767fc17157c0e SHA256 9295cf427e3f52e418ccb9d5491057fc90df13b1ce8621657ccaf70741e61763
AUX helium-1.2-libraries.patch 1943 RMD160 d4e074d29d8919a0f2e8333c93313e44fcf15ade SHA1 c1109d2823b31e39627784b130aa380f5224ad7a SHA256 6206b35d537d93a91bcfc374bf11831850190897e60761f4a68b71e9014b7eb6
AUX helium-1.2-readline.patch 1661 RMD160 7fa5e4f9c8cd5daa7ac81720c2d7514efc4f3085 SHA1 4a35deefd9c5285acb88a7746f79b36041c6b7b9 SHA256 fcd69f6ed0a32769d156164597632e0d2dbfc8cf99b70da61d15e7b488525dfc
+AUX helium-1.6-respect-cflags-ldflags-nostrip.patch 1847 RMD160 374937c5a4b7bf21c10200b3a1bf9e0f8954da80 SHA1 1b31994158460f40880f81e12d9538ccf71ded7a SHA256 333b77e13e38d7639e79251d32346c9f1857d2b6585ec2c85ec2b325c13ca34e
AUX helium-wrapper 715 RMD160 d149b2fecd4fb572207dac9ce367200c9ba69e9a SHA1 722c021ab96d588fe6f9eddb7bd9182b58b70afe SHA256 58516ac6fce8f7749f4e365a1317e427d23e68a2476c785090f955959a4ddb93
AUX helium-wrapper-1.6 549 RMD160 7b655dbeb5fc1898e928b4509463ebc6337913bb SHA1 0f68302441564a68ee98e9d7d700a0df0a65fca1 SHA256 32fd3f3e349cb23f19b467d27180ef5af20fb538b17ba6fd95ed1743670d703a
DIST Hint.jar 120170 RMD160 7d6185a093d718cbdc8e97b7d8a2af2465fbc548 SHA1 cb5f47b100590afecf547d11c3c40b27685846d0 SHA256 a6f8a13ef58552c13e88ff773ede5c6a1816a1a293eec66d500897aedd1cc441
@@ -10,6 +11,6 @@ DIST helium-1.6-ghc.patch.bz2 34579 RMD160 7754353e882d233533011f7e7be0bc92c01b8
DIST helium-1.6-src.tar.gz 960254 RMD160 9700dde4b77adb73825965c00cdc02d3e1f6fab6 SHA1 9e1d43d25c92f86c57fe5864e26365923dcfe98c SHA256 a93632d031a16c0ea516f4fa7ce63acd0950543c74265e22abd0993856a0a053
EBUILD helium-1.1.ebuild 1894 RMD160 1a0666daade3bb6f3be442e94ec5065da26ff401 SHA1 b769456ef3ef58e64ed7ccce3aa310dad5fcf0b6 SHA256 4186c2d6a69a479cf966e8ef224bab145f86c4fd6f03533d1456b3a0f996d103
EBUILD helium-1.2-r1.ebuild 2303 RMD160 1145867666122311a3efee2fd1b5c798022d8b89 SHA1 f7d9e78550d7f9000ba81628d6602cd597b7fbae SHA256 efa8d8aca10d84d52971adb293e13a73b32b528e060a8732dcec6740c2e91245
-EBUILD helium-1.6.ebuild 3808 RMD160 8eab9db8eb4a459b8bec90b527ca7ea9a5eb891f SHA1 4f87708504ac6ae937a4f797a97bb80a8269deb5 SHA256 e0229c26193be53f39ae73230050945dcec360aea112124940beccd52be6c0b9
-MISC ChangeLog 3612 RMD160 030382791cdaf61475b215d1f845e3615b0d5654 SHA1 868d2c9d15b656d7ceb0f59a9e56e35fb852cfa2 SHA256 cdf4802053978b6968f26850fd234ae1442fe639a1e00c000ce3a846a71ca401
+EBUILD helium-1.6.ebuild 3875 RMD160 200d6a0f418a37a37fe2d89ffebb7e18e57c1bb6 SHA1 cc76a0421c61191e60e41df2a8adc758ccc600df SHA256 84887e2844b46eecba84ccf38c06e7969f90bb42ba7aec868205d84a69a88c75
+MISC ChangeLog 3945 RMD160 6eeb5f106626c0ac489bdc3841f795993b2c9ccb SHA1 8aef83c14e62fa69ac2e38288c6ed1aeff164eca SHA256 2a01a6ab3452efa17ed9bf2f3ee04b396659fc1a49c6aa622713dc6f2e8cd7a9
MISC metadata.xml 161 RMD160 f485b248c733c0ef48ebe461e56d10631182864d SHA1 e3539af233f1a90c2470823747cae37ab10d5b2e SHA256 f560c0c2c8a2f2ca3c0c03e1836e16da7085b32ea60e03d9add5e405dac9f004
diff --git a/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch b/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch
new file mode 100644
index 000000000000..6c035ad3b8fc
--- /dev/null
+++ b/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch
@@ -0,0 +1,59 @@
+Original report: https://bugs.gentoo.org/attachment.cgi?id=244509
+
+The patch is not ideal as lvm/src/configure runs
+compiler tests without those flags enabled, but
+they are broken anyways.
+
+Added CFLAGS, LDFLAGS, remover STRIP call in C part of lvm.
+diff --git a/lvm/src/configure b/lvm/src/configure
+index 9aa1a1d..2789828 100755
+--- a/helium-1.6/lvm/src/configure
++++ b/helium-1.6/lvm/src/configure
+@@ -647,7 +647,7 @@ fi
+ echo "CC=$ccomp" >> makefile
+ echo "LINK=$link" >> makefile
+ echo "STRIP=$strip" >> makefile
+-echo "LINKOPTS=$cclinkopts" >> makefile
++echo "LINKOPTS=$cclinkopts \$(LDFLAGS)" >> makefile
+ echo "EXE=$exe" >> makefile
+ echo "DLL=$dll" >> makefile
+ echo "CP=cp" >> makefile
+@@ -662,7 +662,7 @@ case "$config" in
+ echo "CONFIGPATH=../config" >> makefile;;
+ esac
+
+-echo "CCOPTS=$cccompopts -I\$(CONFIGPATH)" >> makefile
++echo "CCOPTS=$cccompopts -I\$(CONFIGPATH) \$(CFLAGS)" >> makefile
+
+ rm -f tst$exe hasgot.c *.obj
+
+diff --git a/lvm/src/lib/makefile b/lvm/src/lib/makefile
+index d9a0004..78cce0f 100644
+--- a/helium-1.6/lvm/src/lib/makefile
++++ b/helium-1.6/lvm/src/lib/makefile
+@@ -55,7 +55,6 @@ OBJS = $(SRCS:.hs=.o)
+ # The main target
+ $(MAIN)$(EXE): $(OBJS)
+ $(HC) -o $@ $(HC_OPTS) $(OBJS)
+- $(STRIP) $@
+
+ common/ghc/Special.hi: common/ghc/Special.hs
+ $(HC) -c $< -cpp -fglasgow-exts $(HC_OPTS)
+diff --git a/lvm/src/runtime/makefile b/lvm/src/runtime/makefile
+index 310a7b6..bde3550 100644
+--- a/helium-1.6/lvm/src/runtime/makefile
++++ b/helium-1.6/lvm/src/runtime/makefile
+@@ -47,11 +47,10 @@ OBJS = $(SRCS:.c=.o)
+
+
+ #lvmrun$(EXE): $(OBJS)
+-# $(LINK) -o $@ $(LINKOPT) $(OBJS) -g
++# $(LINK) -o $@ $(OBJS) -g $(LINKOPT)
+
+ lvmrun$(EXE): $(OBJS)
+- $(LINK) -o $@ $(LINKOPT) $(OBJS)
+- $(STRIP) $@
++ $(LINK) -o $@ $(OBJS) $(LINKOPT)
+
+ core/evaluator.o: core/evaluator.c
+ $(CC) -o $@ -c $< $(CCOPT_FAST)
diff --git a/dev-lang/helium/helium-1.6.ebuild b/dev-lang/helium/helium-1.6.ebuild
index 9ef411864001..8e2528edad25 100644
--- a/dev-lang/helium/helium-1.6.ebuild
+++ b/dev-lang/helium/helium-1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.6.ebuild,v 1.4 2010/07/24 22:11:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.6.ebuild,v 1.5 2010/08/29 18:30:50 slyfox Exp $
inherit autotools eutils
@@ -25,6 +25,7 @@ RDEPEND="dev-libs/gmp
src_unpack() {
unpack ${A}
epatch "${P}-ghc.patch"
+ epatch "${FILESDIR}/helium-1.6-respect-cflags-ldflags-nostrip.patch"
# split base only
sed -e 's/^GHCFLAGS =.*$/& -package containers/' \
@@ -67,7 +68,7 @@ src_unpack() {
-i "${S}/$bad_file"
done
- # cabal is their friend (oneOf bwcame polymorphic and breaks the test)
+ # cabal is their friend (oneOf became polymorphic and breaks the test)
sed -e 's/Text.ParserCombinators.Parsec/&.Pos/g' \
-e 's/oneOf/newPos/g' \
-i "${S}/helium/configure.in"