From f08095666907f36c763b3b186a6f47b2c2f09cb6f7c5f635be1cf7861936f001 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 24 Oct 2007 23:58:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ebtables?expand=0&rev=5 --- ebtables-v2.0.8-initscript.diff | 11 +++++++++++ ebtables-v2.0.8-makefile.diff | 9 +++++++++ ebtables.changes | 5 +++++ ebtables.spec | 4 +++- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ebtables-v2.0.8-initscript.diff b/ebtables-v2.0.8-initscript.diff index 691fca6..13d8eb1 100644 --- a/ebtables-v2.0.8-initscript.diff +++ b/ebtables-v2.0.8-initscript.diff @@ -1,3 +1,14 @@ +--- Makefile ++++ Makefile +@@ -85,7 +85,7 @@ + + .PHONY: libebtc + libebtc: $(OBJECTS2) +- $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) ++ $(LD) -shared -Wl,-soname -Wl,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) \ --- ebtables.sysv +++ ebtables.sysv @@ -11,6 +11,14 @@ diff --git a/ebtables-v2.0.8-makefile.diff b/ebtables-v2.0.8-makefile.diff index c25b9ec..f9ab7e0 100644 --- a/ebtables-v2.0.8-makefile.diff +++ b/ebtables-v2.0.8-makefile.diff @@ -1,5 +1,14 @@ --- Makefile +++ Makefile +@@ -18,7 +18,7 @@ + CFLAGS:=-Wall -Wunused + CFLAGS_SH_LIB:=-fPIC + CC:=gcc +-LD:=ld ++LD:=gcc + + ifeq ($(shell uname -m),sparc64) + CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 @@ -154,28 +154,28 @@ .PHONY: scripts scripts: ebtables-save ebtables.sysv ebtables-config diff --git a/ebtables.changes b/ebtables.changes index 22e64f8..1efe7d0 100644 --- a/ebtables.changes +++ b/ebtables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 24 18:55:52 CEST 2007 - ro@suse.de + +- fix build (use gcc not ld directly) + ------------------------------------------------------------------- Wed Oct 17 16:17:18 CEST 2007 - prusnak@suse.cz diff --git a/ebtables.spec b/ebtables.spec index 906679c..044ba98 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -15,7 +15,7 @@ License: GPL v2 or later Group: Productivity/Networking/Security AutoReqProv: on Version: v2.0.8 -Release: 4 +Release: 6 Summary: Ethernet Bridge Tables Source: %{name}-%{version}-2.tar.bz2 Patch0: %{name}-%{version}-makefile.diff @@ -91,6 +91,8 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/ebtables-save %{_sbindir}/rcebtables %changelog +* Wed Oct 24 2007 - ro@suse.de +- fix build (use gcc not ld directly) * Wed Oct 17 2007 - prusnak@suse.cz - fixed specfile not to include debug files in normal package * Fri Oct 12 2007 - prusnak@suse.cz