d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a crude workaround for ports with flavors

Browse Source
This commit is contained in:
Poul-Henning Kamp 2017-12-29 15:38:43 +00:00
parent 294a9f4f9e
commit 5a57de683b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/tools/sysbuild/sysbuild.sh
View File

@ -196,13 +196,20 @@ ports_recurse() (
echo "$t" >> /tmp/_.plist.tdone echo "$t" >> /tmp/_.plist.tdone
for d for d
do do
fl=""
if [ ! -d $d ] ; then if [ ! -d $d ] ; then
echo "Missing port $d ($t)" 1>&2 fl=FLAVOR=`expr $d : '.*@\(.*\)'`
continue bd=`expr $d : '\(.*\)@.*'`
if [ ! -d $bd ] ; then
echo "Missing port $d ($t) (fl $fl) (bd $bd)" 1>&2
continue
fi
echo "Flavored port $d ($t) (fl $fl) (bd $bd)" 1>&2
d=$bd
fi fi
d=`cd /usr/ports && cd $d && /bin/pwd` d=`cd /usr/ports && cd $d && /bin/pwd`
if [ ! -f $d/Makefile ] ; then if [ ! -f $d/Makefile ] ; then
echo "Missing port $d" 1>&2 echo "Missing port (Makefile) $d" 1>&2
continue continue
fi fi
if [ "x$t" != "x." ] ; then if [ "x$t" != "x." ] ; then
@ -216,7 +223,7 @@ ports_recurse() (
( (
cd $d cd $d
l="" l=""
for a in `ports_make -V _UNIFIED_DEPENDS` for a in `ports_make -V _UNIFIED_DEPENDS $fl`
do do
x=`expr "$a" : '.*:\(.*\)'` x=`expr "$a" : '.*:\(.*\)'`
l="${l} ${x}" l="${l} ${x}"