OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Aug-2005 14:57:45
Branch: HEAD Handle: 2005081313574500
Modified files:
openpkg-src/openpkg openpkg.spec
Log:
unbreak the upgrade step (older package release already installed, but
still no l_xxxx variables available) after Thomas' latest l_xxxx
variable additions
Summary:
Revision Changes Path
1.442 +20 -13 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.441 -r1.442 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 12 Aug 2005 22:51:40 -0000 1.441
+++ openpkg-src/openpkg/openpkg.spec 13 Aug 2005 12:57:45 -0000 1.442
@@ -261,22 +261,29 @@
echo "shtool=$shtool" >>./.buildenv
# development tools
- l_tar="%{l_tar}"; export l_tar
- echo "l_tar=\"$l_tar\"; export l_tar" >>.buildenv
- l_make="%{l_make}"; export l_make
- echo "l_make=\"$l_make\"; export l_make" >>.buildenv
- l_cc="%{l_cc}"; export l_cc
- echo "l_cc=\"$l_cc\"; export l_cc" >>.buildenv
- l_ar="%{l_ar}"; export l_ar
- echo "l_ar=\"$l_ar\"; export l_ar" >>.buildenv
- l_ld="%{l_ld}"; export l_ld
- echo "l_ld=\"$l_ld\"; export l_ld" >>.buildenv
- l_strip="%{l_strip}"; export l_strip
- echo "l_strip=\"$l_strip\"; export l_strip" >>.buildenv
+ l_tar="tar"; export l_tar
+ l_make="make"; export l_make
+ l_cc="cc"; export l_cc
+ l_ar="ar"; export l_ar
+ l_ld="ld"; export l_ld
+ l_strip="strip"; export l_strip
+ [ ".%{?l_tar:set}" = .set ] && l_tar="%{l_tar}"
+ [ ".%{?l_make:set}" = .set ] && l_make="%{l_make}"
+ [ ".%{?l_cc:set}" = .set ] && l_cc="%{l_cc}"
+ [ ".%{?l_ar:set}" = .set ] && l_ar="%{l_ar}"
+ [ ".%{?l_ld:set}" = .set ] && l_ld="%{l_ld}"
+ [ ".%{?l_strip:set}" = .set ] && l_strip="%{l_strip}"
+ ( echo "l_tar=\"$l_tar\"; export l_tar"
+ echo "l_make=\"$l_make\"; export l_make"
+ echo "l_cc=\"$l_cc\"; export l_cc"
+ echo "l_ar=\"$l_ar\"; export l_ar"
+ echo "l_ld=\"$l_ld\"; export l_ld"
+ echo "l_strip=\"$l_strip\"; export l_strip"
+ ) >>.buildenv
# determine path to aux.usrgrp.sh script
usrgrp=`SOURCE aux.usrgrp.sh`
- echo "usrgrp=$usrgrp" >>./.buildenv
+ echo "usrgrp=$usrgrp; export usrgrp" >>./.buildenv
# display verbosity header
set +x; VERBOSE "PREPARATION: Determine OpenPKG User/Group Name/Id
Pairs"; set -x
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
