summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-08-20 11:18:35 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-08-20 11:18:35 +0000
commitbad3cf114631f02c2f88de387e82b14591e7cb39 (patch)
tree9b6583a5415b5ddb481ca6890f391909db412b4c
parent4ad1fcff8e03ff2f7d713f83441fd5ea8042c623 (diff)
downloads6-bad3cf114631f02c2f88de387e82b14591e7cb39.tar.xz
Better support for slashpackage nsss builds
-rwxr-xr-xconfigure19
-rw-r--r--package/deps-build1
2 files changed, 14 insertions, 6 deletions
diff --git a/configure b/configure
index 68d89d2..c147abb 100755
--- a/configure
+++ b/configure
@@ -250,12 +250,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 a966904..1c19bb7 100644
--- a/package/deps-build
+++ b/package/deps-build
@@ -1,2 +1,3 @@
/package/prog/skalibs
+/package/admin/nsss $usensss
/package/admin/execline