| 1 |
fauli 09/04/08 23:11:56 |
| 2 |
|
| 3 |
Added: erlang-13.1-LDFLAGS.patch |
| 4 |
Log: |
| 5 |
revision bump to make all modules respect LDFLAGS, patch provided by Davide Pesavento <davidepesa AT gmail DOT com> in bug 263129 |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/erlang/files/erlang-13.1-LDFLAGS.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/files/erlang-13.1-LDFLAGS.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/erlang/files/erlang-13.1-LDFLAGS.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: erlang-13.1-LDFLAGS.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur otp_src_R13A~orig/erts/emulator/Makefile.in otp_src_R13A/erts/emulator/Makefile.in |
| 17 |
--- otp_src_R13A~orig/erts/emulator/Makefile.in 2009-04-04 14:25:34.000000000 +0200 |
| 18 |
+++ otp_src_R13A/erts/emulator/Makefile.in 2009-04-04 16:53:23.000000000 +0200 |
| 19 |
@@ -256,6 +256,7 @@ |
| 20 |
else |
| 21 |
CS_CFLAGS = $(CS_CFLAGS_) |
| 22 |
endif |
| 23 |
+CS_LDFLAGS = $(LDFLAGS) |
| 24 |
CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal @ERTS_INTERNAL_X_LIBS@ |
| 25 |
|
| 26 |
LIBS += @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@ |
| 27 |
@@ -654,8 +655,8 @@ |
| 28 |
CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c |
| 29 |
|
| 30 |
$(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC) |
| 31 |
- $(CS_PURIFY) $(CC) -o $(BINDIR)/$(CS_EXECUTABLE) \ |
| 32 |
- $(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS) |
| 33 |
+ $(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \ |
| 34 |
+ $(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS) |
| 35 |
|
| 36 |
$(OBJDIR)/%.elib.o: beam/%.c |
| 37 |
$(CC) $(ELIB_FLAGS) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ |
| 38 |
diff -Naur otp_src_R13A~orig/lib/asn1/c_src/Makefile.in otp_src_R13A/lib/asn1/c_src/Makefile.in |
| 39 |
--- otp_src_R13A~orig/lib/asn1/c_src/Makefile.in 2009-04-04 14:25:15.000000000 +0200 |
| 40 |
+++ otp_src_R13A/lib/asn1/c_src/Makefile.in 2009-04-04 17:48:14.000000000 +0200 |
| 41 |
@@ -60,7 +60,7 @@ |
| 42 |
DRIVER_INCLUDES = -I$(ERL_TOP)/erts/emulator/beam \ |
| 43 |
-I$(ERL_TOP)/erts/emulator/sys/$(ERLANG_OSTYPE) |
| 44 |
CFLAGS = $(DRIVER_INCLUDES) $(EI_INCLUDES) @DED_CFLAGS@ |
| 45 |
-LDFLAGS = @DED_LDFLAGS@ |
| 46 |
+LDFLAGS += @DED_LDFLAGS@ |
| 47 |
|
| 48 |
LD_INCL_EI = -L$(EI_LIBDIR) |
| 49 |
|
| 50 |
diff -Naur otp_src_R13A~orig/lib/crypto/c_src/Makefile.in otp_src_R13A/lib/crypto/c_src/Makefile.in |
| 51 |
--- otp_src_R13A~orig/lib/crypto/c_src/Makefile.in 2009-04-04 14:25:16.000000000 +0200 |
| 52 |
+++ otp_src_R13A/lib/crypto/c_src/Makefile.in 2009-04-04 17:48:32.000000000 +0200 |
| 53 |
@@ -33,7 +33,7 @@ |
| 54 |
LD = @DED_LD@ |
| 55 |
SHELL = /bin/sh |
| 56 |
LIBS = @LIBS@ |
| 57 |
-LDFLAGS = @DED_LDFLAGS@ |
| 58 |
+LDFLAGS += @DED_LDFLAGS@ |
| 59 |
CFLAGS = @DED_CFLAGS@ |
| 60 |
ERLANG_OSTYPE = @ERLANG_OSTYPE@ |
| 61 |
TARGET = @host@ |
| 62 |
diff -Naur otp_src_R13A~orig/lib/erl_interface/src/Makefile.in otp_src_R13A/lib/erl_interface/src/Makefile.in |
| 63 |
--- otp_src_R13A~orig/lib/erl_interface/src/Makefile.in 2009-04-04 14:25:16.000000000 +0200 |
| 64 |
+++ otp_src_R13A/lib/erl_interface/src/Makefile.in 2009-04-04 16:41:46.000000000 +0200 |
| 65 |
@@ -715,11 +715,11 @@ |
| 66 |
else |
| 67 |
ifdef THR_DEFS |
| 68 |
$(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB) |
| 69 |
- $(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \ |
| 70 |
+ $(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \ |
| 71 |
-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS) |
| 72 |
else |
| 73 |
$(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB) |
| 74 |
- $(PURIFY) $(CC) $(PROG_CFLAGS) -o $@ $(ERLCALL) \ |
| 75 |
+ $(PURIFY) $(CC) $(PROG_CFLAGS) $(LDFLAGS) -o $@ $(ERLCALL) \ |
| 76 |
-L$(OBJDIR) -lei $(LIBS) |
| 77 |
endif |
| 78 |
endif |
| 79 |
diff -Naur otp_src_R13A~orig/lib/megaco/src/flex/Makefile.in otp_src_R13A/lib/megaco/src/flex/Makefile.in |
| 80 |
--- otp_src_R13A~orig/lib/megaco/src/flex/Makefile.in 2009-04-04 14:25:16.000000000 +0200 |
| 81 |
+++ otp_src_R13A/lib/megaco/src/flex/Makefile.in 2009-04-04 17:57:24.000000000 +0200 |
| 82 |
@@ -48,7 +48,7 @@ |
| 83 |
CC = @CC@ |
| 84 |
CFLAGS_MT = $(CFLAGS) -D_THREAD_SAFE -D_REENTRANT |
| 85 |
LD = @DED_LD@ |
| 86 |
-LDFLAGS = @DED_LDFLAGS@ |
| 87 |
+LDFLAGS += @DED_LDFLAGS@ |
| 88 |
LEX = @LEX@ |
| 89 |
LEXLIB = @LEXLIB@ |
| 90 |
PERL = @PERL@ |
| 91 |
diff -Naur otp_src_R13A~orig/lib/runtime_tools/c_src/Makefile.in otp_src_R13A/lib/runtime_tools/c_src/Makefile.in |
| 92 |
--- otp_src_R13A~orig/lib/runtime_tools/c_src/Makefile.in 2009-04-04 14:25:34.000000000 +0200 |
| 93 |
+++ otp_src_R13A/lib/runtime_tools/c_src/Makefile.in 2009-04-04 16:23:59.000000000 +0200 |
| 94 |
@@ -35,7 +35,7 @@ |
| 95 |
LD = @DED_LD@ |
| 96 |
SHELL = /bin/sh |
| 97 |
LIBS = @LIBS@ |
| 98 |
-LDFLAGS = @DED_LDFLAGS@ |
| 99 |
+LDFLAGS += @DED_LDFLAGS@ |
| 100 |
ERLANG_OSTYPE = @ERLANG_OSTYPE@ |
| 101 |
|
| 102 |
SYSINCLUDE = -I$(ERL_TOP)/erts/emulator/beam \ |
| 103 |
diff -Naur otp_src_R13A~orig/lib/ssl/c_src/Makefile.in otp_src_R13A/lib/ssl/c_src/Makefile.in |
| 104 |
--- otp_src_R13A~orig/lib/ssl/c_src/Makefile.in 2009-04-04 14:25:15.000000000 +0200 |
| 105 |
+++ otp_src_R13A/lib/ssl/c_src/Makefile.in 2009-04-04 16:33:37.000000000 +0200 |
| 106 |
@@ -163,7 +163,7 @@ |
| 107 |
|
| 108 |
# Unix |
| 109 |
$(BINDIR)/ssl_esock: $(OBJS) |
| 110 |
- $(CC) $(CC_R_OPT) $(PLAIN_CFLAGS) -o $@ $^ $(LIBS) $(SSL_LINK_LIB) |
| 111 |
+ $(CC) $(CC_R_OPT) $(PLAIN_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SSL_LINK_LIB) |
| 112 |
|
| 113 |
# Win32/Cygwin |
| 114 |
$(BINDIR)/ssl_esock.exe: $(OBJS) |
Archives