source: patches/iproute2-2.6.22-070710-libdir-1.patch@ 095ad7c

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 095ad7c was 918a9d3, checked in by Jim Gifford <clfs@…>, 17 years ago

Updated IPRoute2 to 2.6.22-070710
  • Property mode set to 100644
File size: 3.3 KB

  • iproute2-2.6.22-070710 

    Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
Date: 2007-09-01
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.22-070710.orig/include/iptables.h iproute2-2.6.22-070710/include/iptables.h
    old new  
    55#include "libiptc/libiptc.h"
    66
    77#ifndef IPT_LIB_DIR
    8 #define IPT_LIB_DIR "/usr/local/lib/iptables"
     8#define IPT_LIB_DIR LIBDIR
    99#endif
    1010
    1111#ifndef IPPROTO_SCTP

  • iproute2-2.6.22-070710 

    diff -Naur iproute2-2.6.22-070710.orig/Makefile iproute2-2.6.22-070710/Makefile
    old new  
    11DESTDIR=
    22SBINDIR=/usr/sbin
     3LIBDIR=/usr/lib
     4VARLIB=/var/lib
    35CONFDIR=/etc/iproute2
    46DOCDIR=/usr/share/doc/iproute2
    57MANDIR=/usr/share/man
    … …  
    2224CC = gcc
    2325HOSTCC = gcc
    2426CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
    25 CFLAGS = $(CCOPTS) -I../include $(DEFINES)
     27CFLAGS = -DLIBDIR=\"$(LIBDIR)\" -DVARLIB=\"$(VARLIB)\" $(CCOPTS) -I../include $(DEFINES)
    2628YACCFLAGS = -d -t -v
    2729
    2830LDLIBS += -L../lib -lnetlink -lutil

  • iproute2-2.6.22-070710 

    diff -Naur iproute2-2.6.22-070710.orig/misc/arpd.c iproute2-2.6.22-070710/misc/arpd.c
    old new  
    4040int resolve_hosts;
    4141
    4242DB      *dbase;
    43 char    *dbname = "/var/lib/arpd/arpd.db";
     43char    *dbname = VARLIB "/arpd/arpd.db";
    4444
    4545int     ifnum;
    4646int     *ifvec;

  • iproute2-2.6.22-070710 

    diff -Naur iproute2-2.6.22-070710.orig/netem/Makefile iproute2-2.6.22-070710/netem/Makefile
    old new  
    44HOSTCC ?= $(CC)
    55LDLIBS += -lm
    66
     7LIBDIR = /usr/lib
     8
    79all: $(DISTGEN) $(DISTDATA)
    810
    911$(DISTGEN):
    … …  
    1921        $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
    2022
    2123install: all
    22         mkdir -p $(DESTDIR)/usr/lib/tc
     24        mkdir -p $(DESTDIR)/$(LIBDIR)/tc
    2325        for i in $(DISTDATA); \
    24         do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \
     26        do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \
    2527        done
    2628
    2729clean:

  • iproute2-2.6.22-070710 

    diff -Naur iproute2-2.6.22-070710.orig/tc/Makefile iproute2-2.6.22-070710/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.22-070710 

    diff -Naur iproute2-2.6.22-070710.orig/tc/tc_util.c iproute2-2.6.22-070710/tc/tc_util.c
    old new  
    3030
    3131        lib_dir = getenv("TC_LIB_DIR");
    3232        if (!lib_dir)
    33                 lib_dir = "/usr/lib/tc";
     33                lib_dir = LIBDIR "/tc";
    3434
    3535        return lib_dir;
    3636}
Note: See TracBrowser for help on using the repository browser.