source:
patches/iproute2-2.6.26-libdir-1.patch@
e133476
Last change on this file since e133476 was e8e6c4e, checked in by , 16 years ago | |
---|---|
|
|
File size: 3.8 KB |
-
iproute2-2.6.26
Submitted By: Joe Ciccone <jciccone@gmail.com> Date: 2008-09-31 Upstream Status: Unknown Origin: Joe Ciccone Description: This patch gives the ability to change the libdir.
old new 1 # Generated config based on /usr/src/clfs-tarballs/conglomeration/iproute2-2.6.26/include -
include/iptables.h
diff -Naur iproute2-2.6.26.orig/include/iptables.h iproute2-2.6.26/include/iptables.h
old new 4 4 #include "iptables_common.h" 5 5 #include "libiptc/libiptc.h" 6 6 7 #ifndef LIBDIR 8 #define LIBDIR "/lib" 9 #endif 10 7 11 #ifndef IPT_LIB_DIR 8 #define IPT_LIB_DIR "/usr/local/lib/iptables"12 #define IPT_LIB_DIR LIBDIR "/iptables" 9 13 #endif 10 14 11 15 #ifndef IPPROTO_SCTP -
iproute2-2.6.26
diff -Naur iproute2-2.6.26.orig/ip/iplink.c iproute2-2.6.26/ip/iplink.c
old new 34 34 35 35 #define IPLINK_IOCTL_COMPAT 1 36 36 #ifndef DESTDIR 37 #define DESTDIR "/usr/" 37 #define DESTDIR "/usr" 38 #endif 39 40 #ifndef LIBDIR 41 #define LIBDIR "/lib" 38 42 #endif 39 43 40 44 static void usage(void) __attribute__((noreturn)); … … 81 85 if (strcmp(l->id, id) == 0) 82 86 return l; 83 87 84 snprintf(buf, sizeof(buf), DESTDIR "/lib/ip/link_%s.so", id);88 snprintf(buf, sizeof(buf), DESTDIR LIBDIR "/ip/link_%s.so", id); 85 89 dlh = dlopen(buf, RTLD_LAZY); 86 90 if (dlh == NULL) { 87 91 /* look in current binary, only open once */ -
iproute2-2.6.26
diff -Naur iproute2-2.6.26.orig/Makefile iproute2-2.6.26/Makefile
old new 1 DESTDIR=/usr /1 DESTDIR=/usr 2 2 SBINDIR=/sbin 3 3 CONFDIR=/etc/iproute2 4 4 DOCDIR=/share/doc/iproute2 5 5 MANDIR=/share/man 6 6 7 LIBDIR=/lib 8 7 9 # Path to db_185.h include 8 10 DBM_INCLUDE:=/usr/include 9 11 10 DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" 12 DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" -DLIBDIR=\"$(LIBDIR)\" 11 13 12 14 #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc) 13 15 LDLIBS=-lresolv -
netem/Makefile
diff -Naur iproute2-2.6.26.orig/netem/Makefile iproute2-2.6.26/netem/Makefile
old new 20 20 $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm 21 21 22 22 install: all 23 mkdir -p $(DESTDIR) /lib/tc23 mkdir -p $(DESTDIR)$(LIBDIR)/tc 24 24 for i in $(DISTDATA); \ 25 do install -m 755 $$i $(DESTDIR) /lib/tc; \25 do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ 26 26 done 27 27 28 28 clean: -
iproute2-2.6.26
diff -Naur iproute2-2.6.26.orig/tc/Makefile iproute2-2.6.26/tc/Makefile
old new 72 72 $(AR) rcs $@ $(TCLIB) 73 73 74 74 install: all 75 mkdir -p $(DESTDIR) /lib/tc75 mkdir -p $(DESTDIR)$(LIBDIR)/tc 76 76 install -m 0755 tc $(DESTDIR)$(SBINDIR) 77 77 for i in $(TCSO); \ 78 do install -m 755 $$i $(DESTDIR) /lib/tc; \78 do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ 79 79 done 80 80 81 81 clean: -
iproute2-2.6.26
diff -Naur iproute2-2.6.26.orig/tc/tc_util.c iproute2-2.6.26/tc/tc_util.c
old new 25 25 #include "tc_util.h" 26 26 27 27 #ifndef DESTDIR 28 #define DESTDIR "/usr/" 28 #define DESTDIR "/usr" 29 #endif 30 31 #ifndef LIBDIR 32 #define LIBDIR "/lib" 29 33 #endif 30 34 31 35 const char *get_tc_lib(void) … … 34 38 35 39 lib_dir = getenv("TC_LIB_DIR"); 36 40 if (!lib_dir) 37 lib_dir = DESTDIR "/lib/tc";41 lib_dir = DESTDIR LIBDIR "/tc"; 38 42 39 43 return lib_dir; 40 44 }
Note:
See TracBrowser
for help on using the repository browser.