92c429a Update autosetup to latest version — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Update autosetup to latest version

Baptiste Daroussin committed 5 years ago

commit 92c429a7bdda960bf8249966735a15ccb1e0d406
parent fea82f3

4 files changed +10 -11

modified autosetup/README.autosetup

@@ -1,4 +1,4 @@

 README.autosetup created by autosetup v0.6.9+
 README.autosetup created by autosetup v0.7.0+
 This is the autosetup directory for a local install of autosetup.
 It contains autosetup, support files and loadable modules.

modified autosetup/autosetup

@@ -6,7 +6,7 @@

 dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@"
 # Note that the version has a trailing + on unreleased versions
 set autosetup(version) 0.6.9+
 set autosetup(version) 0.7.0+
 # Can be set to 1 to debug early-init problems
 set autosetup(debug) [expr {"--debug" in $argv}]

modified autosetup/autosetup-find-tclsh

@@ -1,17 +1,15 @@

 #!/bin/sh
 # Looks for a suitable tclsh or jimsh in the PATH
 # If not found, builds a bootstrap jimsh from source
 # Prefer $autosetup_tclsh if is set in the environment
 d=`dirname "$0"`
 { "$d/jimsh0" "$d/autosetup-test-tclsh"; } 2>/dev/null && exit 0
 PATH="$PATH:$d"; export PATH
 for tclsh in $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6; do
 # If not found, builds a bootstrap jimsh in current dir from source
 # Prefer $autosetup_tclsh if is set in the environment (unless ./jimsh0 works)
 d="`dirname "$0"`"
 for tclsh in ./jimsh0 $autosetup_tclsh jimsh tclsh tclsh8.5 tclsh8.6 tclsh8.7; do
 	{ $tclsh "$d/autosetup-test-tclsh"; } 2>/dev/null && exit 0
 done
 echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
 for cc in ${CC_FOR_BUILD:-cc} gcc; do
 	{ $cc -o "$d/jimsh0" "$d/jimsh0.c"; } 2>/dev/null || continue
 	"$d/jimsh0" "$d/autosetup-test-tclsh" && exit 0
 	{ $cc -o jimsh0 "$d/jimsh0.c"; } 2>/dev/null || continue
 	./jimsh0 "$d/autosetup-test-tclsh" && exit 0
 done
 echo 1>&2 "No working C compiler found. Tried ${CC_FOR_BUILD:-cc} and gcc."
 echo false

modified autosetup/pkg-config.tcl

@@ -53,11 +53,12 @@ proc pkg-config-init {{required 1}} {

 			define SYSROOT [file-normalize $o]
 			msg-result "Using specified sysroot [get-define SYSROOT]"
 		} elseif {[get-define build] ne [get-define host]} {
 			if {[catch {exec-with-stderr [get-define CC] -print-sysroot} result errinfo] == 0} {
 			if {[catch {exec-with-stderr {*}[get-define CC] -print-sysroot} result errinfo] == 0} {
 				# Use the compiler sysroot, if there is one
 				define SYSROOT $result
 				msg-result "Found compiler sysroot $result"
 			} else {
 				configlog "[get-define CC] -print-sysroot: $result"
 				set msg "pkg-config: Cross compiling, but no compiler sysroot and no --sysroot supplied"
 				if {$required} {
 					user-error $msg