diff --git a/package/base/pciutils/ar-ranlib-hotfix.patch.cross b/package/base/pciutils/ar-ranlib-hotfix.patch.cross deleted file mode 100644 index aa8919c99..000000000 --- a/package/base/pciutils/ar-ranlib-hotfix.patch.cross +++ /dev/null @@ -1,13 +0,0 @@ ---- ./lib/Makefile.orig 2007-06-30 06:39:27.000000000 +0200 -+++ ./lib/Makefile 2007-06-30 06:39:43.000000000 +0200 -@@ -53,8 +53,8 @@ - - $(PCILIB): $(OBJS) - rm -f $@ -- ar rcs $@ $^ -- ranlib $@ -+ $(AR) rcs $@ $^ -+ $(RANLIB) $@ - - access.o: access.c $(INCL) - i386-ports.o: i386-ports.c $(INCL) i386-io-hurd.h i386-io-linux.h i386-io-sunos.h diff --git a/package/base/pciutils/no-uname-m.patch.cross b/package/base/pciutils/no-uname-m.patch.cross deleted file mode 100644 index e5db175e2..000000000 --- a/package/base/pciutils/no-uname-m.patch.cross +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lib/configure.orig 2007-07-01 10:00:43.000000000 +0200 -+++ ./lib/configure 2007-07-01 10:03:08.000000000 +0200 -@@ -20,7 +20,7 @@ - proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1` - cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'` - else -- cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'` -+ cpu=`echo $ROCK_ARCH | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'` - fi - if [ "$sys" = "GNU/kFreeBSD" ] - then diff --git a/package/base/pciutils/pciutils.conf b/package/base/pciutils/pciutils.conf index 81572b461..9e6365469 100644 --- a/package/base/pciutils/pciutils.conf +++ b/package/base/pciutils/pciutils.conf @@ -25,9 +25,11 @@ var_append makeopt ' ' 'PREFIX=/$prefix' var_append makeinstopt ' ' 'PREFIX=/$prefix' -# see no-uname-m.patch.cross -if [ $stagelevel -le 1 ]; then - export ROCK_ARCH="$arch" +if [ $crossnative = cross ]; then + for x in makeopt makeinstopt; do + var_append $x " " "HOST=$arch_target CROSS_COMPILE=1" + var_remove_regex $x " " "STRIP=.*" + done fi # install libpci.a library @@ -41,3 +43,4 @@ pciutils_pm () } hook_add postmake 5 "pciutils_pm" +