Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / b48b7b4109868a8c0ddda090992e936e821c7ea6 / . / import-layers / meta-openembedded / meta-networking / recipes-support / arptables / arptables-0.0.3-4 / arptables-compile-install.patch
blob: 80e98047241d99fd917ff873a088a3d90270e14d [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame^]1Index: arptables-v0.0.3-4/Makefile
2===================================================================
3--- arptables-v0.0.3-4.orig/Makefile 2010-03-08 18:49:28.000000000 +0300
4+++ arptables-v0.0.3-4/Makefile 2010-03-22 15:52:56.000000000 +0300
5@@ -6,12 +6,11 @@
6 LIBDIR:=$(PREFIX)/lib
7 BINDIR:=$(PREFIX)/sbin
8 MANDIR:=$(PREFIX)/man
9-INITDIR:=/etc/rc.d/init.d
10+INITDIR:=/etc/init.d
11 SYSCONFIGDIR:=/etc/sysconfig
12 DESTDIR:=
13
14-COPT_FLAGS:=-O2
15-CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
16+ARPCFLAGS:=-Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\"
17
18 ifndef ARPT_LIBDIR
19 ARPT_LIBDIR:=$(LIBDIR)/arptables
20@@ -22,16 +21,16 @@
21 all: arptables
22
23 arptables.o: arptables.c
24- $(CC) $(CFLAGS) -c -o $@ $<
25+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $<
26
27 arptables-standalone.o: arptables-standalone.c
28- $(CC) $(CFLAGS) -c -o $@ $<
29+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $<
30
31 libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
32- $(CC) $(CFLAGS) -c -o $@ $<
33+ $(CC) $(CFLAGS) $(ARPCFLAGS) -c -o $@ $<
34
35 arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
36- $(CC) $(CFLAGS) -o $@ $^
37+ $(CC) $(LDFLAGS) $(CFLAGS) $(ARPCFLAGS) -o $@ $^
38
39 $(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
40 mkdir -p $(@D)
41@@ -50,6 +49,7 @@
42 cat arptables-restore | sed 's/__EXEC_PATH__/$(tmp1)/g' > arptables-restore_
43 install -m 0755 -o root -g root arptables-restore_ $(DESTDIR)$(BINDIR)/arptables-restore
44 cat arptables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > arptables.sysv_
45+ install -d $(DESTDIR)$(INITDIR)
46 if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root arptables.sysv_ $(DESTDIR)$(INITDIR)/arptables; fi
47 rm -f arptables-save_ arptables-restore_ arptables.sysv_
48
49Index: arptables-v0.0.3-4/extensions/Makefile
50===================================================================
51--- arptables-v0.0.3-4.orig/extensions/Makefile 2010-03-08 18:49:28.000000000 +0300
52+++ arptables-v0.0.3-4/extensions/Makefile 2010-03-22 15:52:38.000000000 +0300
53@@ -4,4 +4,7 @@
54 EXT_OBJS+=$(foreach T,$(EXT_FUNC), extensions/arpt_$(T).o)
55
56 extensions/ebt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
57- $(CC) $(CFLAGS) $(PROGSPECS) -c -o $@ $<
58+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<
59+
60+extensions/arpt_%.o: extensions/arpt_%.c include/arptables.h include/arptables_common.h
61+ $(CC) $(CFLAGS) $(ARPCFLAGS) $(PROGSPECS) -c -o $@ $<