| 1 |
slyfox 10/08/29 18:30:50 |
| 2 |
|
| 3 |
Added: helium-1.6-respect-cflags-ldflags-nostrip.patch |
| 4 |
Log: |
| 5 |
Fixed build failure with forced --as-needed (bug #334403). Removed binary stripping, CFLAGS are now respected too. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: helium-1.6-respect-cflags-ldflags-nostrip.patch |
| 15 |
=================================================================== |
| 16 |
Original report: https://bugs.gentoo.org/attachment.cgi?id=244509 |
| 17 |
|
| 18 |
The patch is not ideal as lvm/src/configure runs |
| 19 |
compiler tests without those flags enabled, but |
| 20 |
they are broken anyways. |
| 21 |
|
| 22 |
Added CFLAGS, LDFLAGS, remover STRIP call in C part of lvm. |
| 23 |
diff --git a/lvm/src/configure b/lvm/src/configure |
| 24 |
index 9aa1a1d..2789828 100755 |
| 25 |
--- a/helium-1.6/lvm/src/configure |
| 26 |
+++ b/helium-1.6/lvm/src/configure |
| 27 |
@@ -647,7 +647,7 @@ fi |
| 28 |
echo "CC=$ccomp" >> makefile |
| 29 |
echo "LINK=$link" >> makefile |
| 30 |
echo "STRIP=$strip" >> makefile |
| 31 |
-echo "LINKOPTS=$cclinkopts" >> makefile |
| 32 |
+echo "LINKOPTS=$cclinkopts \$(LDFLAGS)" >> makefile |
| 33 |
echo "EXE=$exe" >> makefile |
| 34 |
echo "DLL=$dll" >> makefile |
| 35 |
echo "CP=cp" >> makefile |
| 36 |
@@ -662,7 +662,7 @@ case "$config" in |
| 37 |
echo "CONFIGPATH=../config" >> makefile;; |
| 38 |
esac |
| 39 |
|
| 40 |
-echo "CCOPTS=$cccompopts -I\$(CONFIGPATH)" >> makefile |
| 41 |
+echo "CCOPTS=$cccompopts -I\$(CONFIGPATH) \$(CFLAGS)" >> makefile |
| 42 |
|
| 43 |
rm -f tst$exe hasgot.c *.obj |
| 44 |
|
| 45 |
diff --git a/lvm/src/lib/makefile b/lvm/src/lib/makefile |
| 46 |
index d9a0004..78cce0f 100644 |
| 47 |
--- a/helium-1.6/lvm/src/lib/makefile |
| 48 |
+++ b/helium-1.6/lvm/src/lib/makefile |
| 49 |
@@ -55,7 +55,6 @@ OBJS = $(SRCS:.hs=.o) |
| 50 |
# The main target |
| 51 |
$(MAIN)$(EXE): $(OBJS) |
| 52 |
$(HC) -o $@ $(HC_OPTS) $(OBJS) |
| 53 |
- $(STRIP) $@ |
| 54 |
|
| 55 |
common/ghc/Special.hi: common/ghc/Special.hs |
| 56 |
$(HC) -c $< -cpp -fglasgow-exts $(HC_OPTS) |
| 57 |
diff --git a/lvm/src/runtime/makefile b/lvm/src/runtime/makefile |
| 58 |
index 310a7b6..bde3550 100644 |
| 59 |
--- a/helium-1.6/lvm/src/runtime/makefile |
| 60 |
+++ b/helium-1.6/lvm/src/runtime/makefile |
| 61 |
@@ -47,11 +47,10 @@ OBJS = $(SRCS:.c=.o) |
| 62 |
|
| 63 |
|
| 64 |
#lvmrun$(EXE): $(OBJS) |
| 65 |
-# $(LINK) -o $@ $(LINKOPT) $(OBJS) -g |
| 66 |
+# $(LINK) -o $@ $(OBJS) -g $(LINKOPT) |
| 67 |
|
| 68 |
lvmrun$(EXE): $(OBJS) |
| 69 |
- $(LINK) -o $@ $(LINKOPT) $(OBJS) |
| 70 |
- $(STRIP) $@ |
| 71 |
+ $(LINK) -o $@ $(OBJS) $(LINKOPT) |
| 72 |
|
| 73 |
core/evaluator.o: core/evaluator.c |
| 74 |
$(CC) -o $@ -c $< $(CCOPT_FAST) |
Archives