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: 27-Jul-2005 17:06:17
Branch: HEAD Handle: 2005072716061700
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
remove dependency to binutils tools size(1) and strip(1)
Summary:
Revision Changes Path
1.283 +2 -1 openpkg-src/openpkg/HISTORY
1.437 +23 -9 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.282 -r1.283 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Jul 2005 06:24:39 -0000 1.282
+++ openpkg-src/openpkg/HISTORY 27 Jul 2005 15:06:17 -0000 1.283
@@ -2,7 +2,8 @@
2005
====
-20050727 added to rpmtool the detetection for "number of CPUs" under AIX for
"make -j"
+20050727 remove dependency to binutils tools size(1) and strip(1)
+20050727 added to rpmtool the detection for "number of CPUs" under AIX for
"make -j"
20050726 **** RELEASE AS PART OF OPENPKG 2.4.2 ***
20050726 Cosmetics in "openpkg rpm --help" output
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.436 -r1.437 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 27 Jul 2005 06:24:39 -0000 1.436
+++ openpkg-src/openpkg/openpkg.spec 27 Jul 2005 15:06:17 -0000 1.437
@@ -582,6 +582,10 @@
# build GNU bash tool
( cd bash-%{V_bash}
+ # remove dependency to size(1) during bash build
+ sh $shtool subst \
+ -e 's;\(size $(Program)\);\1 || true;' \
+ Makefile.in
( # force disabled wide-character support
echo "ac_cv_header_wchar_h=no"
echo "ac_cv_header_wctype_h=no"
@@ -844,8 +848,18 @@
# display verbosity header
set +x; VERBOSE "INSTALL: Stripping Down Installation"; set -x
+ # manually make sure strip(1) is available or use a null replacement
+ l_strip=""; [ ".%{?l_strip:set}" = .set ] && l_strip="%{l_strip}";
export l_strip
+ if [ ".$l_strip" = . ]; then
+ l_strip=`sh $shtool path strip`
+ if [ ".$l_strip" = . ]; then
+ echo "openpkg: prerequisite tool \`strip' not found - using null
replacement"
+ l_strip="echo"
+ fi
+ fi
+
# strip RPM installation
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/bin/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/* >/dev/null 2>&1 || true
for dir in man/ja man/pl man/ru man/sk src; do
rm -rf $RPM_BUILD_ROOT%{l_prefix}/$dir >/dev/null 2>&1 || true
@@ -965,35 +979,35 @@
# install RPM extension
( cd rpm-%{V_rpm}
cp file/file $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/file
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/file
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/file
) || exit $?
( cd curl-%{V_curl}
cp src/curl $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/curl
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/curl
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/curl
) || exit $?
( cd bzip2-%{V_bzip2}
cp bzip2 $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bzip2
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bzip2
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bzip2
) || exit $?
( cd gzip-%{V_gzip}
cp gzip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/gzip
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/gzip
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/gzip
) || exit $?
( cd patch-%{V_patch}
cp patch $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/patch
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/patch
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/patch
) || exit $?
( cd tar-%{V_tar}
cp tar $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar
) || exit $?
( cd bash-%{V_bash}
cp bash $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/bash
) || exit $?
( cd uuid-%{V_uuid}
cp uuid $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/uuid
- strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/uuid
+ ${l_strip} $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/uuid
) || exit $?
sed -e "s;@l_prefix@;%{l_prefix};g" \
-e "s;@l_musr@;%{l_musr};g" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
