| 1 |
pva 09/06/22 15:06:37 |
| 2 |
|
| 3 |
Added: ebtables-v2.0.9-1-LDFLAGS.diff |
| 4 |
Log: |
| 5 |
Version bump, fixes 'invalid size 8 != 4', bug #273693 reported by Joakim Tjernlund. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ebtables/files/ebtables-v2.0.9-1-LDFLAGS.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ebtables-v2.0.9-1-LDFLAGS.diff |
| 15 |
=================================================================== |
| 16 |
=== modified file 'Makefile' |
| 17 |
--- Makefile 2009-06-22 14:41:37 +0000 |
| 18 |
+++ Makefile 2009-06-22 14:52:59 +0000 |
| 19 |
@@ -18,7 +18,6 @@ |
| 20 |
CFLAGS:=-Wall -Wunused |
| 21 |
CFLAGS_SH_LIB:=-fPIC |
| 22 |
CC:=gcc |
| 23 |
-LD:=ld |
| 24 |
|
| 25 |
ifeq ($(shell uname -m),sparc64) |
| 26 |
CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 |
| 27 |
@@ -85,10 +84,10 @@ |
| 28 |
|
| 29 |
.PHONY: libebtc |
| 30 |
libebtc: $(OBJECTS2) |
| 31 |
- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) |
| 32 |
+ $(CC) -shared $(LDFLAGS) -Wl,-soname=libebtc.so -o libebtc.so -lc $(OBJECTS2) |
| 33 |
|
| 34 |
ebtables: $(OBJECTS) ebtables-standalone.o libebtc |
| 35 |
- $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ |
| 36 |
+ $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ |
| 37 |
-Wl,-rpath,$(LIBDIR) |
| 38 |
|
| 39 |
ebtablesu: ebtablesu.c |
| 40 |
@@ -105,7 +104,7 @@ |
| 41 |
$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES) |
| 42 |
|
| 43 |
ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc |
| 44 |
- $(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ |
| 45 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \ |
| 46 |
-Wl,-rpath,$(LIBDIR) |
| 47 |
|
| 48 |
.PHONY: daemon |
| 49 |
|
| 50 |
=== modified file 'extensions/Makefile' |
| 51 |
--- extensions/Makefile 2009-06-22 14:41:37 +0000 |
| 52 |
+++ extensions/Makefile 2009-06-22 14:55:36 +0000 |
| 53 |
@@ -11,13 +11,13 @@ |
| 54 |
EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T)) |
| 55 |
|
| 56 |
extensions/ebt_%.so: extensions/ebt_%.o |
| 57 |
- $(CC) -shared -o $@ -lc $< -nostartfiles |
| 58 |
+ $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles |
| 59 |
|
| 60 |
extensions/libebt_%.so: extensions/ebt_%.so |
| 61 |
mv $< $@ |
| 62 |
|
| 63 |
extensions/ebtable_%.so: extensions/ebtable_%.o |
| 64 |
- $(CC) -shared -o $@ -lc $< -nostartfiles |
| 65 |
+ $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles |
| 66 |
|
| 67 |
extensions/libebtable_%.so: extensions/ebtable_%.so |
| 68 |
mv $< $@ |
Archives