tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Bootstrapping without cwrappers
Hi tech-pkg@,
since cwrappers was enabled by default on some platforms, it is
effectively impossible to bootstrap without cwrappers there.
The patch attached here is a first attempt at fixing it. It basically
turns "--cwrappers" into "--cwrappers <auto|yes|no>", while keeping the
default to "auto" of course.
Thoughts?
Cheers,
--
khorben
Index: bootstrap
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/bootstrap,v
retrieving revision 1.240
diff -p -u -r1.240 bootstrap
--- bootstrap 11 Feb 2017 16:08:31 -0000 1.240
+++ bootstrap 16 Apr 2017 16:59:04 -0000
@@ -58,7 +58,7 @@ usage="Usage: $0 "'
[ --binary-kit <tarball> ]
[ --binary-macpkg <pkg> ]
[ --compiler <compiler> ]
- [ --cwrappers ]
+ [ --cwrappers <auto|yes|no> ]
[ --full ]
[ --gzip-binary-kit <tarball> ]
[ --help ]
@@ -407,7 +407,7 @@ sysconfdir=
varbase=
compiler=""
-cwrappers=no
+cwrappers=auto
full=no
make_jobs=1
mk_fragment=
@@ -433,7 +433,8 @@ while [ $# -gt 0 ]; do
--compiler) compiler="$2"; shift ;;
--abi=*) abi=`get_optarg "$1"` ;;
--abi) abi="$2"; shift ;;
- --cwrappers) cwrappers=yes ;;
+ --cwrappers=*) cwrappers=`get_optarg "$1"` ;;
+ --cwrappers) cwrappers="$2"; shift ;;
--unprivileged | --ignore-user-check) unprivileged=yes ;;
--prefer-pkgsrc=*)
prefer_pkgsrc=`get_optarg "$1"` ;;
@@ -1086,8 +1087,8 @@ BOOTSTRAP_MKCONF=${wrkdir}/mk.conf
cp ${TARGET_MKCONF} ${BOOTSTRAP_MKCONF}
case "$cwrappers" in
-yes)
- echo "USE_CWRAPPERS= yes" >> ${TARGET_MKCONF}
+yes|no)
+ echo "USE_CWRAPPERS= $cwrappers" >> ${TARGET_MKCONF}
echo "" >> ${TARGET_MKCONF}
;;
esac
Home |
Main Index |
Thread Index |
Old Index