diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:04:47 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:04:47 +0000 |
| commit | 326278e8a5b6b44860136dbede6be46514a9d276 (patch) | |
| tree | e90bb4f07942a2385d4988b329558de1d378b807 | |
| parent | e1831105a2696a21ee1e9bbb032780714c5764a8 (diff) | |
| download | execline-326278e8a5b6b44860136dbede6be46514a9d276.tar.gz execline-326278e8a5b6b44860136dbede6be46514a9d276.tar.xz execline-326278e8a5b6b44860136dbede6be46514a9d276.zip | |
Add mechanism for conditional slashpackage builds in deps-build
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | package/deps-build | 1 |
2 files changed, 14 insertions, 6 deletions
diff --git a/configure b/configure index d51a466..ef53dad 100755 --- a/configure +++ b/configure @@ -257,12 +257,19 @@ if $slashpackage ; then if $shebangisdefault ; then shebangdir=${extbinprefix} fi - 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 |