summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-03-16 07:49:09 +0000
committerPeter Volkov <pva@gentoo.org>2010-03-16 07:49:09 +0000
commitc3a225a4420509c37f56cb9611ddf450a4d70dfc (patch)
treeacdc977eba582806bdac06153aae5f6f39072c8f /net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
parentVersion bump: fix for rolling back on local copy errors. Install VERSION file... (diff)
downloadgentoo-2-c3a225a4420509c37f56cb9611ddf450a4d70dfc.tar.gz
gentoo-2-c3a225a4420509c37f56cb9611ddf450a4d70dfc.tar.bz2
gentoo-2-c3a225a4420509c37f56cb9611ddf450a4d70dfc.zip
Version bump, #309479 thank hitachi for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff')
-rw-r--r--net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff54
1 files changed, 54 insertions, 0 deletions
diff --git a/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
new file mode 100644
index 000000000000..ab5d9aafe575
--- /dev/null
+++ b/net-firewall/ebtables/files/ebtables-v2.0.9-2-LDFLAGS.diff
@@ -0,0 +1,54 @@
+=== modified file 'Makefile'
+--- Makefile 2010-03-16 07:37:01 +0000
++++ Makefile 2010-03-16 07:39:15 +0000
+@@ -18,7 +18,6 @@
+ CFLAGS:=-Wall -Wunused
+ CFLAGS_SH_LIB:=-fPIC
+ CC:=gcc
+-LD:=ld
+
+ ifeq ($(shell uname -m),sparc64)
+ CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
+@@ -85,10 +84,10 @@
+
+ .PHONY: libebtc
+ libebtc: $(OBJECTS2)
+- $(CC) -shared -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
++ $(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
+
+ ebtables: $(OBJECTS) ebtables-standalone.o libebtc
+- $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
++ $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ -Wl,-rpath,$(LIBDIR)
+
+ ebtablesu: ebtablesu.c
+@@ -105,7 +104,7 @@
+ $(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@ -I$(KERNEL_INCLUDES)
+
+ ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc
+- $(CC) $(CFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+ -Wl,-rpath,$(LIBDIR)
+
+ .PHONY: daemon
+
+=== modified file 'extensions/Makefile'
+--- extensions/Makefile 2010-03-16 07:37:01 +0000
++++ extensions/Makefile 2010-03-16 07:37:43 +0000
+@@ -11,13 +11,13 @@
+ EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T))
+
+ extensions/ebt_%.so: extensions/ebt_%.o
+- $(CC) -shared -o $@ -lc $< -nostartfiles
++ $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
+
+ extensions/libebt_%.so: extensions/ebt_%.so
+ mv $< $@
+
+ extensions/ebtable_%.so: extensions/ebtable_%.o
+- $(CC) -shared -o $@ -lc $< -nostartfiles
++ $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles
+
+ extensions/libebtable_%.so: extensions/ebtable_%.so
+ mv $< $@
+