| 1 |
keri 10/08/22 06:09:58 |
| 2 |
|
| 3 |
Added: mercury-10.04-linker-flags.patch |
| 4 |
Log: |
| 5 |
Respect LDFLAGS |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/mercury/files/mercury-10.04-linker-flags.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04-linker-flags.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mercury/files/mercury-10.04-linker-flags.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mercury-10.04-linker-flags.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur mercury-compiler-10.04.orig/boehm_gc/Makefile.direct mercury-compiler-10.04/boehm_gc/Makefile.direct |
| 17 |
--- mercury-compiler-10.04.orig/boehm_gc/Makefile.direct 2010-02-24 20:04:32.000000000 +1300 |
| 18 |
+++ mercury-compiler-10.04/boehm_gc/Makefile.direct 2010-08-22 17:21:08.000000000 +1200 |
| 19 |
@@ -351,7 +351,7 @@ |
| 20 |
-ldl `./threadlibs` |
| 21 |
./if_not_there on_sparc_sunos5_so $(MAKE) dyn_load.o |
| 22 |
./if_not_there on_sparc_sunos5_so \ |
| 23 |
- $(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc |
| 24 |
+ $(LINK_SHARED_OBJ) -o lib$(GC_GRADE).so $(OBJS) dyn_load.o -lc $(EXTRA_LDFLAGS) |
| 25 |
|
| 26 |
# Darwin shared library version of the gc. |
| 27 |
lib$(GC_GRADE).dylib: $(OBJS) $(UTILS) |
| 28 |
diff -ur mercury-compiler-10.04.orig/runtime/Mmakefile mercury-compiler-10.04/runtime/Mmakefile |
| 29 |
--- mercury-compiler-10.04.orig/runtime/Mmakefile 2010-07-16 03:24:52.000000000 +1200 |
| 30 |
+++ mercury-compiler-10.04/runtime/Mmakefile 2010-08-22 16:44:33.000000000 +1200 |
| 31 |
@@ -387,7 +387,7 @@ |
| 32 |
$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED) \ |
| 33 |
-o lib$(RT_LIB_NAME).so $(PIC_OBJS) \ |
| 34 |
$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_GC_LIB_DIR) \ |
| 35 |
- $(LDFLAGS) $(LDLIBS) $(THREADLIBS) \ |
| 36 |
+ $(ALL_LDFLAGS) $(LDLIBS) $(THREADLIBS) \ |
| 37 |
$(SHARED_LIBS) |
| 38 |
|
| 39 |
# For Darwin we should pass the -install_name option. |
| 40 |
diff -ur mercury-compiler-10.04.orig/trace/Mmakefile mercury-compiler-10.04/trace/Mmakefile |
| 41 |
--- mercury-compiler-10.04.orig/trace/Mmakefile 2008-07-30 05:58:58.000000000 +1200 |
| 42 |
+++ mercury-compiler-10.04/trace/Mmakefile 2010-08-22 16:57:29.000000000 +1200 |
| 43 |
@@ -273,6 +273,7 @@ |
| 44 |
$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED) \ |
| 45 |
-o lib$(TRACE_LIB_NAME).so $(TRACE_PIC_OBJS) \ |
| 46 |
$(RPATH_1)$(RPATH_2) \ |
| 47 |
+ $(ALL_LDFLAGS) \ |
| 48 |
$(TRACE_LDFLAGS) $(TRACE_LDLIBS) $(THREADLIBS) \ |
| 49 |
$(SHARED_LIBS) |
| 50 |
|
| 51 |
@@ -280,6 +281,7 @@ |
| 52 |
$(LINK_SHARED_OBJ) $(ERROR_UNDEFINED) \ |
| 53 |
-o lib$(EVENTSPEC_LIB_NAME).so $(EVENTSPEC_PIC_OBJS) \ |
| 54 |
$(RPATH_1)$(RPATH_2) \ |
| 55 |
+ $(ALL_LDFLAGS) \ |
| 56 |
$(EVENTSPEC_LDFLAGS) $(EVENTSPEC_LDLIBS) $(THREADLIBS) \ |
| 57 |
$(SHARED_LIBS) |
| 58 |
|
| 59 |
diff -ur mercury-compiler-10.04.orig/util/Mmakefile mercury-compiler-10.04/util/Mmakefile |
| 60 |
--- mercury-compiler-10.04.orig/util/Mmakefile 2010-07-12 04:31:03.000000000 +1200 |
| 61 |
+++ mercury-compiler-10.04/util/Mmakefile 2010-08-22 11:54:02.000000000 +1200 |
| 62 |
@@ -41,16 +41,16 @@ |
| 63 |
|
| 64 |
.c: |
| 65 |
$(MGNUC) --no-mercury-stdlib-dir \ |
| 66 |
- $(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ $< $(GETOPT_SRC) |
| 67 |
+ $(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ $< $(GETOPT_SRC) |
| 68 |
|
| 69 |
mkinit: mkinit.c mkinit_common.c mkinit_common.h |
| 70 |
$(MGNUC) --no-mercury-stdlib-dir \ |
| 71 |
- $(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \ |
| 72 |
+ $(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \ |
| 73 |
mkinit.c mkinit_common.c $(GETOPT_SRC) |
| 74 |
|
| 75 |
mkinit_erl: mkinit_erl.c mkinit_common.c mkinit_common.h |
| 76 |
$(MGNUC) --no-mercury-stdlib-dir \ |
| 77 |
- $(GRADEFLAGS) $(ALL_MGNUCFLAGS) -o $@ \ |
| 78 |
+ $(GRADEFLAGS) $(ALL_MGNUCFLAGS) $(ALL_LDFLAGS) -o $@ \ |
| 79 |
mkinit_erl.c mkinit_common.c $(GETOPT_SRC) |
| 80 |
|
| 81 |
tags: |
Archives