OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Apr-2007 12:41:53
Branch: HEAD Handle: 2007041911415101
Modified files:
openpkg-src/openpkg HISTORY aux.wrapsrc.sh openpkg.boot openpkg.spec
rpmmacros
Log:
support %l_as macro and --use_as bootstrap option to complement ar, ld,
strip handling
sponsored by BinckBank
Summary:
Revision Changes Path
1.445 +1 -0 openpkg-src/openpkg/HISTORY
1.24 +1 -1 openpkg-src/openpkg/aux.wrapsrc.sh
1.64 +4 -2 openpkg-src/openpkg/openpkg.boot
1.580 +14 -1 openpkg-src/openpkg/openpkg.spec
1.82 +1 -0 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.444 -r1.445 HISTORY
--- openpkg-src/openpkg/HISTORY 11 Apr 2007 15:48:48 -0000 1.444
+++ openpkg-src/openpkg/HISTORY 19 Apr 2007 10:41:51 -0000 1.445
@@ -2,6 +2,7 @@
2007
====
+20070417 support %l_as macro and --use_as bootstrap option to complement ar,
ld, strip handling
20070411 upgrade to cURL 7.16.2
20070329 add variables to expand uuid(8) information in the "openpkg
release" format
20070322 cosmetic: align code variable name with documentation
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.wrapsrc.sh
============================================================================
$ cvs diff -u -r1.23 -r1.24 aux.wrapsrc.sh
--- openpkg-src/openpkg/aux.wrapsrc.sh 1 Jan 2007 17:40:18 -0000
1.23
+++ openpkg-src/openpkg/aux.wrapsrc.sh 19 Apr 2007 10:41:51 -0000
1.24
@@ -60,7 +60,7 @@
echo " [--{s,m,r,n}usr=<usr>] [--{s,m,r,n}grp=<grp>]" 2>&1
echo " [--{s,m,r,n}uid=<uid>] [--{s,m,r,n}gid=<gid>]" 2>&1
echo " [--use_tar=<tar>] [--use_make=<make>] [--use_cc=<cc>]" 2>&1
- echo " [--use_ar=<ar>] [--use_ld=<ld>] [--use_strip=<strip>]" 2>&1
+ echo " [--use_ar=<ar>] [--use_ld=<ld>] [--use_as=<as>]
[--use_strip=<strip>]" 2>&1
echo " [-t|--tar] [-h|--help] [-v|--version]" 2>&1
exit 1
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.63 -r1.64 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 21 Feb 2007 10:42:44 -0000 1.63
+++ openpkg-src/openpkg/openpkg.boot 19 Apr 2007 10:41:51 -0000 1.64
@@ -56,7 +56,7 @@
muid=''; mgid=''
ruid=''; rgid=''
nuid=''; ngid=''
-use_tar=''; use_make=''; use_cc=''; use_ar=''; use_ld=''; use_strip=''
+use_tar=''; use_make=''; use_cc=''; use_ar=''; use_ld=''; use_as='';
use_strip=''
bs=0
# parse command line options
@@ -94,6 +94,7 @@
--use_cc=* ) use_cc=$arg ;;
--use_ar=* ) use_ar=$arg ;;
--use_ld=* ) use_ld=$arg ;;
+ --use_as=* ) use_as=$arg ;;
--use_strip=* ) use_strip=$arg ;;
-bs | -s ) bs=1 ;;
* ) help=1 ;;
@@ -109,7 +110,7 @@
echo " [--{s,m,r,n}usr=<usr>] [--{s,m,r,n}grp=<grp>]" 2>&1
echo " [--{s,m,r,n}uid=<uid>] [--{s,m,r,n}gid=<gid>]" 2>&1
echo " [--use_tar=<tar>] [--use_make=<make>] [--use_cc=<cc>]" 2>&1
- echo " [--use_ar=<ar>] [--use_ld=<ld>] [--use_strip=<strip>]" 2>&1
+ echo " [--use_ar=<ar>] [--use_ld=<ld>] [--use_as=<as>]
[--use_strip=<strip>]" 2>&1
echo " [-t|--tar] [-h|--help] [-v|--version]" 2>&1
exit 1
fi
@@ -285,6 +286,7 @@
echo "use_cc=$use_cc"
echo "use_ar=$use_ar"
echo "use_ld=$use_ld"
+ echo "use_as=$use_as"
echo "use_strip=$use_strip"
grep '%define' $spec | \
sed \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.579 -r1.580 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 11 Apr 2007 15:48:48 -0000 1.579
+++ openpkg-src/openpkg/openpkg.spec 19 Apr 2007 10:41:51 -0000 1.580
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070411
+%define V_openpkg 20070417
# the used software versions
%define V_rpm 4.2.1
@@ -381,6 +381,19 @@
fi
echo "l_ld=\"$l_ld\"; export l_ld" >>.buildenv
+ # manually make sure as(1) is available
+ l_as=""; export l_as
+ [ ".%{?l_as:set}" = .set ] && l_as="%{l_as}"
+ [ ".%{?use_as:set}" = .set ] && l_as="%{use_as}"
+ if [ ".$l_as" = . ]; then
+ l_as=`sh $shtool path as`
+ if [ ".$l_as" = . ]; then
+ echo "openpkg: prerequisite tool \`as' not found"
+ exit 1
+ fi
+ fi
+ echo "l_as=\"$l_as\"; export l_as" >>.buildenv
+
# manually make sure strip(1) is available or use a null replacement
l_strip=""; export l_strip
[ ".%{?l_strip:set}" = .set ] && l_strip="%{l_strip}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.81 -r1.82 rpmmacros
--- openpkg-src/openpkg/rpmmacros 1 Jan 2007 17:40:20 -0000 1.81
+++ openpkg-src/openpkg/rpmmacros 19 Apr 2007 10:41:52 -0000 1.82
@@ -251,6 +251,7 @@
%l_cc %{l_tool_locate cc cc}
%l_ar %{l_tool_locate ar ar}
%l_ld %{l_tool_locate ld ld}
+%l_as %{l_tool_locate as as}
%l_strip %{l_tool_locate strip strip}
%l_cxx %{l_tool_locate cxx c++}
%l_patch %{l_tool_locate patch patch}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
