From: Peter Volkov <pva@gentoo.org>
To: netfilter-devel@vger.kernel.org
Subject: ebtables-2.0.9-2: build fixes
Date: Tue, 16 Mar 2010 10:52:57 +0300 [thread overview]
Message-ID: <1268725978.19121.3.camel@tablet> (raw)
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
Hello. I hope this is correct mailing list to post patches for ebtables.
Please, review and apply attached patches for ebtables:
1. ebtables-v2.0.9-2-LDFLAGS.diff - respect LDFLAGS during ebtables
build.
2. ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch - create directories
to avoid build failure when DESTDIR is supplied.
With best regards,
--
Peter.
[-- Attachment #2: ebtables-v2.0.8-2-ethertype-DESTDIR-mkdir.patch --]
[-- Type: text/x-patch, Size: 1619 bytes --]
=== modified file 'Makefile'
--- Makefile 2008-08-13 04:20:07 +0000
+++ Makefile 2008-08-13 04:28:51 +0000
@@ -153,10 +153,13 @@
.PHONY: scripts
scripts: ebtables-save ebtables.sysv ebtables-config
cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
+ mkdir -p $(DESTDIR)$(BINDIR)
install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
+ mkdir -p $(DESTDIR)$(INITDIR)
install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
+ mkdir -p $(DESTDIR)$(SYSCONFIGDIR)
install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
@@ -166,9 +169,9 @@
install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
rm -f ebtables.8_
-$(ETHERTYPESFILE): ethertypes
- mkdir -p $(DESTDIR)$(@D)
- install -m 0644 -o root -g root $< $(DESTDIR)$@
+$(DESTDIR)$(ETHERTYPESFILE): ethertypes
+ mkdir -p $(@D)
+ install -m 0644 -o root -g root $< $@
.PHONY: exec
exec: ebtables ebtables-restore
@@ -177,7 +180,7 @@
install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
.PHONY: install
-install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
+install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts
mkdir -p $(DESTDIR)$(LIBDIR)
install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR)
install -m 0755 *.so $(DESTDIR)$(LIBDIR)
[-- Attachment #3: ebtables-v2.0.9-2-LDFLAGS.diff --]
[-- Type: text/x-patch, Size: 1877 bytes --]
=== 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 $< $@
next reply other threads:[~2010-03-16 7:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-16 7:52 Peter Volkov [this message]
2010-03-16 10:31 ` ebtables-2.0.9-2: build fixes Bart De Schuymer
2010-03-16 10:44 ` Jan Engelhardt
2010-03-16 11:21 ` Bart De Schuymer
2010-03-16 13:03 ` Bart De Schuymer
2010-03-16 13:12 ` Bart De Schuymer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268725978.19121.3.camel@tablet \
--to=pva@gentoo.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).