summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-08-20 11:21:32 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-08-20 11:21:32 +0000
commit62ca2e2698fbd0cc94b40bdc8d355a3a5d1ea239 (patch)
treed54223bc3dd32593a7f0f60964b44b241affce0c
parent99e5aafa1c8e99e348d26dda380368f04b442487 (diff)
downloadutmps-62ca2e2698fbd0cc94b40bdc8d355a3a5d1ea239.tar.xz
Better support for nsss slashpackage builds
-rwxr-xr-xconfigure19
-rw-r--r--package/deps-build1
2 files changed, 14 insertions, 6 deletions
diff --git a/configure b/configure
index f076816..9dc24f6 100755
--- a/configure
+++ b/configure
@@ -257,12 +257,19 @@ if $slashpackage ; then
libdir=${home}/library
libexecdir=$bindir
includedir=${home}/include
- while read dep ; do
- addincpath="$addincpath -I${sproot}${dep}/include"
- vpaths="$vpaths ${sproot}${dep}/library"
- addlibspath="$addlibspath -L${sproot}${dep}/library"
- vpathd="$vpathd ${sproot}${dep}/library.so"
- addlibdpath="$addlibdpath -L${sproot}${dep}/library.so"
+ while read dep condvar ; do
+ if test -n "$condvar" ; then
+ eval "cond=$condvar"
+ else
+ cond=true
+ fi
+ if $cond ; then
+ addincpath="$addincpath -I${sproot}${dep}/include"
+ vpaths="$vpaths ${sproot}${dep}/library"
+ addlibspath="$addlibspath -L${sproot}${dep}/library"
+ vpathd="$vpathd ${sproot}${dep}/library.so"
+ addlibdpath="$addlibdpath -L${sproot}${dep}/library.so"
+ fi
done < package/deps-build
fi
diff --git a/package/deps-build b/package/deps-build
index 05d5af4..eb4384b 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1 +1,2 @@
/package/prog/skalibs
+/package/admin/nsss $usensss