diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:42:02 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:42:02 +0000 |
| commit | 8786be7dfc1b61963b9935e4f34fde5dc8c65dfa (patch) | |
| tree | fb649d108be7a15923b08e6b177d73c3971d57d9 /configure | |
| parent | fb4c4e18d1b3237cf83e3f9e012f70821d77554f (diff) | |
| download | s6-rc-8786be7dfc1b61963b9935e4f34fde5dc8c65dfa.tar.gz s6-rc-8786be7dfc1b61963b9935e4f34fde5dc8c65dfa.tar.xz s6-rc-8786be7dfc1b61963b9935e4f34fde5dc8c65dfa.zip | |
Support conditional slashpackage builds
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/configure b/configure index 63f5d9c..e3ff39e 100755 --- a/configure +++ b/configure @@ -249,12 +249,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 |