From dd4d6ee1ff81c3bd6cde50c7a0747f17970dd71c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 21 Oct 2019 17:22:24 +0000
Subject:  Fix gen-deps.sh for cross-builds

---
 package/deps.mak  | 44 ++++++++++++++++++++++----------------------
 tools/gen-deps.sh |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package/deps.mak b/package/deps.mak
index 1d187aa..c464c91 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -21,25 +21,25 @@ src/minutils/s6ps_statparse.o src/minutils/s6ps_statparse.lo: src/minutils/s6ps_
 src/minutils/s6ps_ttycache.o src/minutils/s6ps_ttycache.lo: src/minutils/s6ps_ttycache.c src/minutils/s6-ps.h
 src/minutils/s6ps_wchan.o src/minutils/s6ps_wchan.lo: src/minutils/s6ps_wchan.c src/minutils/s6-ps.h
 
-s6-chroot: EXTRA_LIBS :=
-s6-chroot: src/minutils/s6-chroot.o -lskarnet
-s6-fillurandompool: EXTRA_LIBS :=
-s6-fillurandompool: src/minutils/s6-fillurandompool.o -lskarnet
-s6-freeramdisk: EXTRA_LIBS :=
-s6-freeramdisk: src/minutils/s6-freeramdisk.o -lskarnet
-s6-hostname: EXTRA_LIBS :=
-s6-hostname: src/minutils/s6-hostname.o -lskarnet
-s6-logwatch: EXTRA_LIBS :=
-s6-logwatch: src/minutils/s6-logwatch.o -lskarnet
-s6-mount: EXTRA_LIBS :=
-s6-mount: src/minutils/s6-mount.o -lskarnet
-s6-pivotchroot: EXTRA_LIBS :=
-s6-pivotchroot: src/minutils/s6-pivotchroot.o -lskarnet
-s6-ps: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
-s6-ps: src/minutils/s6-ps.o src/minutils/s6ps_statparse.o src/minutils/s6ps_otree.o src/minutils/s6ps_pfield.o src/minutils/s6ps_pwcache.o src/minutils/s6ps_grcache.o src/minutils/s6ps_ttycache.o src/minutils/s6ps_wchan.o ${LIBNSSS} -lskarnet
-s6-swapoff: EXTRA_LIBS :=
-s6-swapoff: src/minutils/s6-swapoff.o -lskarnet
-s6-swapon: EXTRA_LIBS :=
-s6-swapon: src/minutils/s6-swapon.o -lskarnet
-s6-umount: EXTRA_LIBS :=
-s6-umount: src/minutils/s6-umount.o -lskarnet
+s6-chroot: EXTRA_LIBS := -lskarnet
+s6-chroot: src/minutils/s6-chroot.o
+s6-fillurandompool: EXTRA_LIBS := -lskarnet
+s6-fillurandompool: src/minutils/s6-fillurandompool.o
+s6-freeramdisk: EXTRA_LIBS := -lskarnet
+s6-freeramdisk: src/minutils/s6-freeramdisk.o
+s6-hostname: EXTRA_LIBS := -lskarnet
+s6-hostname: src/minutils/s6-hostname.o
+s6-logwatch: EXTRA_LIBS := -lskarnet
+s6-logwatch: src/minutils/s6-logwatch.o
+s6-mount: EXTRA_LIBS := -lskarnet
+s6-mount: src/minutils/s6-mount.o
+s6-pivotchroot: EXTRA_LIBS := -lskarnet
+s6-pivotchroot: src/minutils/s6-pivotchroot.o
+s6-ps: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB}
+s6-ps: src/minutils/s6-ps.o src/minutils/s6ps_statparse.o src/minutils/s6ps_otree.o src/minutils/s6ps_pfield.o src/minutils/s6ps_pwcache.o src/minutils/s6ps_grcache.o src/minutils/s6ps_ttycache.o src/minutils/s6ps_wchan.o ${LIBNSSS}
+s6-swapoff: EXTRA_LIBS := -lskarnet
+s6-swapoff: src/minutils/s6-swapoff.o
+s6-swapon: EXTRA_LIBS := -lskarnet
+s6-swapon: src/minutils/s6-swapon.o
+s6-umount: EXTRA_LIBS := -lskarnet
+s6-umount: src/minutils/s6-umount.o
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 6383ac2..27e5b3e 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -81,7 +81,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
       if echo $dep | grep -q -- \\.o$ ; then
         dep="src/$dir/$dep"
       fi
-      if echo $dep | grep -q -- '^\${.*_LIB}' ; then
+      if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then
         libs="$libs $dep"
       else
         deps="$deps $dep"
-- 
cgit v1.2.3