Changeset 78a403b
- Timestamp:
- Sep 14, 2012, 2:13:02 PM (12 years ago)
- Branches:
- clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- d08b5bf
- Parents:
- f1778eba
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
patches/iproute2-3.4.0-libdir-1.patch
rf1778eba r78a403b 12 12 13 13 diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile 14 --- iproute2-3.4.0.orig/Makefile 15 +++ iproute2-3.4.0/Makefile 2012-08-26 18:34:17.338322481+000014 --- iproute2-3.4.0.orig/Makefile 2012-05-21 21:12:19.000000000 +0000 15 +++ iproute2-3.4.0/Makefile 2012-09-14 14:10:33.000000000 +0000 16 16 @@ -13,7 +13,7 @@ 17 17 … … 23 23 DEFINES+= -DNO_SHARED_LIBS 24 24 endif 25 diff -Naur iproute2-3.4.0.orig/Makefile.orig iproute2-3.4.0/Makefile.orig26 --- iproute2-3.4.0.orig/Makefile.orig 1970-01-01 00:00:00.000000000 +000027 +++ iproute2-3.4.0/Makefile.orig 2012-05-21 21:12:19.000000000 +000028 @@ -0,0 +1,85 @@29 +ROOTDIR=$(DESTDIR)30 +PREFIX=/usr31 +LIBDIR=$(PREFIX)/lib32 +SBINDIR=/sbin33 +CONFDIR=/etc/iproute234 +DATADIR=$(PREFIX)/share35 +DOCDIR=$(DATADIR)/doc/iproute236 +MANDIR=$(DATADIR)/man37 +ARPDDIR=/var/lib/arpd38 +39 +# Path to db_185.h include40 +DBM_INCLUDE:=$(ROOTDIR)/usr/include41 +42 +SHARED_LIBS = y43 +44 +DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"45 +ifneq ($(SHARED_LIBS),y)46 +DEFINES+= -DNO_SHARED_LIBS47 +endif48 +49 +DEFINES+=-DCONFDIR=\"$(CONFDIR)\"50 +51 +#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)52 +LDLIBS=-lresolv53 +ADDLIB=54 +55 +#options for decnet56 +ADDLIB+=dnet_ntop.o dnet_pton.o57 +58 +#options for ipx59 +ADDLIB+=ipx_ntop.o ipx_pton.o60 +61 +CC = gcc62 +HOSTCC = gcc63 +DEFINES += -D_GNU_SOURCE64 +CCOPTS = -O265 +WFLAGS = -Wall -Wstrict-prototypes66 +CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)67 +YACCFLAGS = -d -t -v68 +69 +SUBDIRS=lib ip tc misc netem genl man70 +71 +LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a72 +LDLIBS += $(LIBNETLINK)73 +74 +all: Config75 + @set -e; \76 + for i in $(SUBDIRS); \77 + do $(MAKE) $(MFLAGS) -C $$i; done78 +79 +Config:80 + sh configure $(KERNEL_INCLUDE)81 +82 +install: all83 + install -m 0755 -d $(DESTDIR)$(SBINDIR)84 + install -m 0755 -d $(DESTDIR)$(CONFDIR)85 + install -m 0755 -d $(DESTDIR)$(ARPDDIR)86 + install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples87 + install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv88 + install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \89 + $(DESTDIR)$(DOCDIR)/examples90 + install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \91 + $(DESTDIR)$(DOCDIR)/examples/diffserv92 + @for i in $(SUBDIRS) doc; do $(MAKE) -C $$i install; done93 + install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)94 +95 +snapshot:96 + echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \97 + > include/SNAPSHOT.h98 +99 +clean:100 + @for i in $(SUBDIRS) doc; \101 + do $(MAKE) $(MFLAGS) -C $$i clean; done102 +103 +clobber:104 + touch Config105 + $(MAKE) $(MFLAGS) clean106 + rm -f Config cscope.*107 +108 +distclean: clobber109 +110 +cscope:111 + cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc112 +113 +.EXPORT_ALL_VARIABLES:114 25 diff -Naur iproute2-3.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptables.h 115 --- iproute2-3.4.0.orig/include/iptables.h 116 +++ iproute2-3.4.0/include/iptables.h 2012-08-26 18:34:17.338322481+000026 --- iproute2-3.4.0.orig/include/iptables.h 2012-05-21 21:12:19.000000000 +0000 27 +++ iproute2-3.4.0/include/iptables.h 2012-09-14 14:10:33.000000000 +0000 117 28 @@ -4,8 +4,12 @@ 118 29 #include "iptables_common.h" … … 130 41 #ifndef IPPROTO_SCTP 131 42 diff -Naur iproute2-3.4.0.orig/misc/arpd.c iproute2-3.4.0/misc/arpd.c 132 --- iproute2-3.4.0.orig/misc/arpd.c 133 +++ iproute2-3.4.0/misc/arpd.c 2012-08-26 18:34:17.338322481+000043 --- iproute2-3.4.0.orig/misc/arpd.c 2012-05-21 21:12:19.000000000 +0000 44 +++ iproute2-3.4.0/misc/arpd.c 2012-09-14 14:10:33.000000000 +0000 134 45 @@ -40,7 +40,7 @@ 135 46 int resolve_hosts; 136 47 137 DB 138 -char 139 +char 48 DB *dbase; 49 -char *dbname = "/var/lib/arpd/arpd.db"; 50 +char *dbname = ARPDDIR "/arpd.db"; 140 51 141 int 142 int 52 int ifnum; 53 int *ifvec;
Note:
See TracChangeset
for help on using the changeset viewer.