source:
patches/iproute2-2.6.18-061002-libdir-1.patch@
ad4134f
Last change on this file since ad4134f was ad01a6a, checked in by , 18 years ago | |
---|---|
|
|
File size: 3.7 KB |
-
iproute2-2.6.16-060323
Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org> Date: 2006-09-28 Upstream Status: Unknown Origin: Joe Ciccone Description: Changes the path of /usr/lib/tc to one defined in the Makefile. diff -Naur iproute2-2.6.16-060323.orig/Makefile iproute2-2.6.16-060323/Makefile
old new 1 1 DESTDIR= 2 2 SBINDIR=/usr/sbin 3 LIBDIR=/usr/lib 3 4 CONFDIR=/etc/iproute2 4 5 DOCDIR=/usr/share/doc/iproute2 5 6 MANDIR=/usr/share/man … … 22 23 CC = gcc 23 24 HOSTCC = gcc 24 25 CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall 25 CFLAGS = $(CCOPTS) -I../include $(DEFINES)26 CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES) 26 27 YACCFLAGS = -d -t -v 27 28 28 29 LDLIBS += -L../lib -lnetlink -lutil -
iproute2-2.6.16-060323
diff -Naur iproute2-2.6.16-060323.orig/netem/Makefile iproute2-2.6.16-060323/netem/Makefile
old new 4 4 HOSTCC ?= $(CC) 5 5 LDLIBS += -lm 6 6 7 LIBDIR = /usr/lib 8 7 9 all: $(DISTGEN) $(DISTDATA) 8 10 9 11 $(DISTGEN): … … 16 18 ./maketable experimental.dat > experimental.dist 17 19 18 20 install: all 19 mkdir -p $(DESTDIR)/ usr/lib/tc21 mkdir -p $(DESTDIR)/$(LIBDIR)/tc 20 22 for i in $(DISTDATA); \ 21 do install -m 755 $$i $(DESTDIR)/ usr/lib/tc; \23 do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \ 22 24 done 23 25 24 26 clean: -
iproute2-2.6.16-060323
diff -Naur iproute2-2.6.16-060323.orig/tc/Makefile iproute2-2.6.16-060323/tc/Makefile
old new 69 69 $(AR) rcs $@ $(TCLIB) 70 70 71 71 install: all 72 mkdir -p $(DESTDIR)/ usr/lib/tc72 mkdir -p $(DESTDIR)/$(LIBDIR)/tc 73 73 install -m 0755 -s tc $(DESTDIR)$(SBINDIR) 74 74 for i in $(TCSO); \ 75 do install -m 755 -s $$i $(DESTDIR)/ usr/lib/tc; \75 do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \ 76 76 done 77 77 78 78 clean: -
iproute2-2.6.16-060323
diff -Naur iproute2-2.6.16-060323.orig/tc/m_ipt.c iproute2-2.6.16-060323/tc/m_ipt.c
old new 48 48 #endif 49 49 50 50 #ifndef IPT_LIB_DIR 51 #define IPT_LIB_DIR "/usr/local/lib/iptables"51 #define IPT_LIB_DIR LIBDIR 52 52 #endif 53 53 54 54 #ifndef PROC_SYS_MODPROBE -
iproute2-2.6.16-060323
diff -Naur iproute2-2.6.16-060323.orig/tc/q_netem.c iproute2-2.6.16-060323/tc/q_netem.c
old new 60 60 char *line = NULL; 61 61 char name[128]; 62 62 63 snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type);63 snprintf(name, sizeof(name), LIBDIR "/tc/%s.dist", type); 64 64 if ((f = fopen(name, "r")) == NULL) { 65 65 fprintf(stderr, "No distribution data for %s (%s: %s)\n", 66 66 type, name, strerror(errno)); -
iproute2-2.6.16-060323
diff -Naur iproute2-2.6.16-060323.orig/tc/tc.c iproute2-2.6.16-060323/tc/tc.c
old new 99 99 if (strcmp(q->id, str) == 0) 100 100 return q; 101 101 102 snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);102 snprintf(buf, sizeof(buf), LIBDIR "/tc/q_%s.so", str); 103 103 dlh = dlopen(buf, RTLD_LAZY); 104 104 if (!dlh) { 105 105 /* look in current binary, only open once */ … … 145 145 if (strcmp(q->id, str) == 0) 146 146 return q; 147 147 148 snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);148 snprintf(buf, sizeof(buf), LIBDIR "/tc/f_%s.so", str); 149 149 dlh = dlopen(buf, RTLD_LAZY); 150 150 if (dlh == NULL) { 151 151 dlh = BODY;
Note:
See TracBrowser
for help on using the repository browser.