external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix buggy bin/package environment behavior (#377)

Browse source 
Running 'bin/package environment' should only show what will happen
during the build process, but in it's current state the feature has
some bugs:

1. Errors can occur relating to the failed creation of files and a
   failed attempt to change the directory. Various errors from
   'bin/package environment make' and 'bin/package environment make
   CC=tcc':
   bin/package[5632]: cd: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen: [No such file or directory]
   bin/package: line 5869: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen/CC: cannot create [No such file or directory]
   bin/package: line 5869: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen/CCFLAGS: cannot create [No such file or directory]
   bin/package: line 5869: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen/CCLDFLAGS: cannot create [No such file or directory]
   bin/package: line 5869: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen/LDFLAGS: cannot create [No such file or directory]
   bin/package: line 5869: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen/KSH_RELFLAGS: cannot create [No such file or directory]
   bin/package[5888]: /home/johno/GitRepos/KornShell/ksh/arch/linux.i386-64/lib/package/gen/host: cannot create [No such file or directory]

2. The package script may in some scenarios create a temporary file
   at the root of the repository, such as 'pkg77213.c'.

bin/package, src/cmd/INIT/package.sh:
- Avoid creating files or changing the directory while the
  environment qualifier is on (this also affects the debug
  qualifier). Part of this fix is based on a patch from Marcin
  Cieślak[*], with other fixes applied for similar problems the
  environment qualifier had.
This commit is contained in:
Johnothan King 2021-12-13 18:53:55 -08:00 • committed by Martijn Dekker
parent 46593a89b7
commit 5084bef41f
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/package
View file

@ -5556,9 +5556,9 @@ make|view)
$t*) ;; $t*) ;;
$b*) cc=$b $b*) cc=$b
;; ;;
$s*) cd $INSTALLROOT/lib/package/gen $s*) $exec cd $INSTALLROOT/lib/package/gen
tmp=pkg$$ tmp=pkg$$
eval '$'exec echo "'int main(){return 0;}' > $tmp.c" $exec eval "echo 'int main(){return 0;}' > $tmp.c"
if $exec $s -o $tmp.exe $tmp.c >/dev/null 2>&1 && if $exec $s -o $tmp.exe $tmp.c >/dev/null 2>&1 &&
test -x $tmp.exe test -x $tmp.exe
then case $HOSTTYPE in then case $HOSTTYPE in
@ -5791,7 +5791,7 @@ cat $j $k
echo "$command: $var changed from $old to $new" >&2 echo "$command: $var changed from $old to $new" >&2
err=y ;; err=y ;;
esac esac
else case $new in else test -d $INSTALLROOT/lib/package/gen && case $new in
'') ;; '') ;;
*) echo "$new" ;; *) echo "$new" ;;
esac > $store esac > $store
@ -5810,7 +5810,7 @@ cat $j $k
# record the build host name # record the build host name
case $noexec in case $exec in
'') hostinfo name '') hostinfo name
echo "$_hostinfo_" | sed 's,\..*,,' > $PACKAGEBIN/gen/host echo "$_hostinfo_" | sed 's,\..*,,' > $PACKAGEBIN/gen/host
;; ;;

8
src/cmd/INIT/package.sh
View file

@ -5556,9 +5556,9 @@ make|view)
$t*) ;; $t*) ;;
$b*) cc=$b $b*) cc=$b
;; ;;
$s*) cd $INSTALLROOT/lib/package/gen $s*) $exec cd $INSTALLROOT/lib/package/gen
tmp=pkg$$ tmp=pkg$$
eval '$'exec echo "'int main(){return 0;}' > $tmp.c" $exec eval "echo 'int main(){return 0;}' > $tmp.c"
if $exec $s -o $tmp.exe $tmp.c >/dev/null 2>&1 && if $exec $s -o $tmp.exe $tmp.c >/dev/null 2>&1 &&
test -x $tmp.exe test -x $tmp.exe
then case $HOSTTYPE in then case $HOSTTYPE in
@ -5791,7 +5791,7 @@ cat $j $k
echo "$command: $var changed from $old to $new" >&2 echo "$command: $var changed from $old to $new" >&2
err=y ;; err=y ;;
esac esac
else case $new in else test -d $INSTALLROOT/lib/package/gen && case $new in
'') ;; '') ;;
*) echo "$new" ;; *) echo "$new" ;;
esac > $store esac > $store
@ -5810,7 +5810,7 @@ cat $j $k
# record the build host name # record the build host name
case $noexec in case $exec in
'') hostinfo name '') hostinfo name
echo "$_hostinfo_" | sed 's,\..*,,' > $PACKAGEBIN/gen/host echo "$_hostinfo_" | sed 's,\..*,,' > $PACKAGEBIN/gen/host
;; ;;