source: patches/iproute2-2.6.18-061002-libdir-1.patch@ 9717098

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 9717098 was ad01a6a, checked in by Jim Gifford <clfs@…>, 18 years ago

Updated book patches
  • Property mode set to 100644
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  
    11DESTDIR=
    22SBINDIR=/usr/sbin
     3LIBDIR=/usr/lib
    34CONFDIR=/etc/iproute2
    45DOCDIR=/usr/share/doc/iproute2
    56MANDIR=/usr/share/man
    … …  
    2223CC = gcc
    2324HOSTCC = gcc
    2425CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
    25 CFLAGS = $(CCOPTS) -I../include $(DEFINES)
     26CFLAGS = -DLIBDIR=\"$(LIBDIR)\" $(CCOPTS) -I../include $(DEFINES)
    2627YACCFLAGS = -d -t -v
    2728
    2829LDLIBS += -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  
    44HOSTCC ?= $(CC)
    55LDLIBS += -lm
    66
     7LIBDIR = /usr/lib
     8
    79all: $(DISTGEN) $(DISTDATA)
    810
    911$(DISTGEN):
    … …  
    1618        ./maketable experimental.dat > experimental.dist
    1719
    1820install: all
    19         mkdir -p $(DESTDIR)/usr/lib/tc
     21        mkdir -p $(DESTDIR)/$(LIBDIR)/tc
    2022        for i in $(DISTDATA); \
    21         do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \
     23        do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \
    2224        done
    2325
    2426clean:

  • iproute2-2.6.16-060323 

    diff -Naur iproute2-2.6.16-060323.orig/tc/Makefile iproute2-2.6.16-060323/tc/Makefile
    old new  
    6969        $(AR) rcs $@ $(TCLIB)
    7070
    7171install: all
    72         mkdir -p $(DESTDIR)/usr/lib/tc
     72        mkdir -p $(DESTDIR)/$(LIBDIR)/tc
    7373        install -m 0755 -s tc $(DESTDIR)$(SBINDIR)
    7474        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; \
    7676        done
    7777
    7878clean:

  • 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  
    4848#endif
    4949
    5050#ifndef IPT_LIB_DIR
    51 #define IPT_LIB_DIR "/usr/local/lib/iptables"
     51#define IPT_LIB_DIR LIBDIR
    5252#endif
    5353
    5454#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  
    6060        char *line = NULL;
    6161        char name[128];
    6262
    63         snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type);
     63        snprintf(name, sizeof(name), LIBDIR "/tc/%s.dist", type);
    6464        if ((f = fopen(name, "r")) == NULL) {
    6565                fprintf(stderr, "No distribution data for %s (%s: %s)\n",
    6666                        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  
    9999                if (strcmp(q->id, str) == 0)
    100100                        return q;
    101101
    102         snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str);
     102        snprintf(buf, sizeof(buf), LIBDIR "/tc/q_%s.so", str);
    103103        dlh = dlopen(buf, RTLD_LAZY);
    104104        if (!dlh) {
    105105                /* look in current binary, only open once */
    … …  
    145145                if (strcmp(q->id, str) == 0)
    146146                        return q;
    147147
    148         snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str);
     148        snprintf(buf, sizeof(buf), LIBDIR "/tc/f_%s.so", str);
    149149        dlh = dlopen(buf, RTLD_LAZY);
    150150        if (dlh == NULL) {
    151151                dlh = BODY;
Note: See TracBrowser for help on using the repository browser.