source: patches/iproute2-2.6.26-libdir-1.patch@ 3faa5de

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 3faa5de was e8e6c4e, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Commit patches from the last commit.

  • Property mode set to 100644
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  
    44#include "iptables_common.h"
    55#include "libiptc/libiptc.h"
    66
     7#ifndef LIBDIR
     8#define LIBDIR "/lib"
     9#endif
     10
    711#ifndef IPT_LIB_DIR
    8 #define IPT_LIB_DIR "/usr/local/lib/iptables"
     12#define IPT_LIB_DIR LIBDIR "/iptables"
    913#endif
    1014
    1115#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  
    3434
    3535#define IPLINK_IOCTL_COMPAT     1
    3636#ifndef DESTDIR
    37 #define DESTDIR "/usr/"
     37#define DESTDIR "/usr"
     38#endif
     39
     40#ifndef LIBDIR
     41#define LIBDIR "/lib"
    3842#endif
    3943
    4044static void usage(void) __attribute__((noreturn));
     
    8185                if (strcmp(l->id, id) == 0)
    8286                        return l;
    8387
    84         snprintf(buf, sizeof(buf), DESTDIR "/lib/ip/link_%s.so", id);
     88        snprintf(buf, sizeof(buf), DESTDIR LIBDIR "/ip/link_%s.so", id);
    8589        dlh = dlopen(buf, RTLD_LAZY);
    8690        if (dlh == NULL) {
    8791                /* 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/
     1DESTDIR=/usr
    22SBINDIR=/sbin
    33CONFDIR=/etc/iproute2
    44DOCDIR=/share/doc/iproute2
    55MANDIR=/share/man
    66
     7LIBDIR=/lib
     8
    79# Path to db_185.h include
    810DBM_INCLUDE:=/usr/include
    911
    10 DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\"
     12DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" -DLIBDIR=\"$(LIBDIR)\"
    1113
    1214#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
    1315LDLIBS=-lresolv
  • netem/Makefile

    diff -Naur iproute2-2.6.26.orig/netem/Makefile iproute2-2.6.26/netem/Makefile
    old new  
    2020        $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
    2121
    2222install: all
    23         mkdir -p $(DESTDIR)/lib/tc
     23        mkdir -p $(DESTDIR)$(LIBDIR)/tc
    2424        for i in $(DISTDATA); \
    25         do install -m 755 $$i $(DESTDIR)/lib/tc; \
     25        do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
    2626        done
    2727
    2828clean:
  • iproute2-2.6.26

    diff -Naur iproute2-2.6.26.orig/tc/Makefile iproute2-2.6.26/tc/Makefile
    old new  
    7272        $(AR) rcs $@ $(TCLIB)
    7373
    7474install: all
    75         mkdir -p $(DESTDIR)/lib/tc
     75        mkdir -p $(DESTDIR)$(LIBDIR)/tc
    7676        install -m 0755 tc $(DESTDIR)$(SBINDIR)
    7777        for i in $(TCSO); \
    78         do install -m 755 $$i $(DESTDIR)/lib/tc; \
     78        do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
    7979        done
    8080
    8181clean:
  • 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  
    2525#include "tc_util.h"
    2626
    2727#ifndef DESTDIR
    28 #define DESTDIR "/usr/"
     28#define DESTDIR "/usr"
     29#endif
     30
     31#ifndef LIBDIR
     32#define LIBDIR "/lib"
    2933#endif
    3034
    3135const char *get_tc_lib(void)
     
    3438
    3539        lib_dir = getenv("TC_LIB_DIR");
    3640        if (!lib_dir)
    37                 lib_dir = DESTDIR "/lib/tc";
     41                lib_dir = DESTDIR LIBDIR "/tc";
    3842
    3943        return lib_dir;
    4044}
Note: See TracBrowser for help on using the repository browser.