OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Jul-2004 22:26:30 Branch: OPENPKG_2_1_SOLID Handle: 2004070221263000 Modified files: (Branch: OPENPKG_2_1_SOLID) openpkg-src/openpkg HISTORY aux.wrapbin.sh aux.wrapsrc.sh openpkg.spec Log: MFC: merge latest fixes from CURRENT Summary: Revision Changes Path 1.195.2.1 +2 -0 openpkg-src/openpkg/HISTORY 1.19.2.1 +1 -0 openpkg-src/openpkg/aux.wrapbin.sh 1.14.4.1 +1 -0 openpkg-src/openpkg/aux.wrapsrc.sh 1.343.2.2 +55 -54 openpkg-src/openpkg/openpkg.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY ============================================================================ $ cvs diff -u -r1.195 -r1.195.2.1 HISTORY --- openpkg-src/openpkg/HISTORY 2 Jul 2004 13:24:01 -0000 1.195 +++ openpkg-src/openpkg/HISTORY 2 Jul 2004 20:26:30 -0000 1.195.2.1 @@ -2,6 +2,8 @@ 2004 ==== +20040702 reorder and split building of tools in order to already unpack problematic cURL tarball with GNU tar +20040702 make sure $PATH contains at least "/bin:/sbin:/usr/bin:/usr/sbin" for bootstrapping 20040702 upgrade to GNU shtool 2.0.0 20040702 update platform prerequisite checks for OpenPKG 2.1 platform set 20040701 add support for openpkg-audit package @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/aux.wrapbin.sh ============================================================================ $ cvs diff -u -r1.19 -r1.19.2.1 aux.wrapbin.sh --- openpkg-src/openpkg/aux.wrapbin.sh 1 Jun 2004 18:13:09 -0000 1.19 +++ openpkg-src/openpkg/aux.wrapbin.sh 2 Jul 2004 20:26:30 -0000 1.19.2.1 @@ -37,6 +37,7 @@ l_version="@l_version@" # establish standard environment +PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin" LC_CTYPE=C export LC_CTYPE umask 022 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/aux.wrapsrc.sh ============================================================================ $ cvs diff -u -r1.14 -r1.14.4.1 aux.wrapsrc.sh --- openpkg-src/openpkg/aux.wrapsrc.sh 17 Feb 2004 19:53:36 -0000 1.14 +++ openpkg-src/openpkg/aux.wrapsrc.sh 2 Jul 2004 20:26:30 -0000 1.14.4.1 @@ -35,6 +35,7 @@ l_version="@l_version@" # establish standard environment +PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin" LC_CTYPE=C export LC_CTYPE umask 022 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/openpkg.spec ============================================================================ $ cvs diff -u -r1.343.2.1 -r1.343.2.2 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 2 Jul 2004 15:26:39 -0000 1.343.2.1 +++ openpkg-src/openpkg/openpkg.spec 2 Jul 2004 20:26:30 -0000 1.343.2.2 @@ -421,13 +421,64 @@ CC="${l_cc}" \ ./configure \ --cache-file=./config.cache - ${l_make} + ${l_make} || exit $? ( mv gzip ..; ${l_make} clean || true; mv ../gzip . ) || exit $? ) || exit $? l_gzip="`pwd`/gzip-%{V_gzip}/gzip"; export l_gzip echo "l_gzip=\"$l_gzip\"; export l_gzip" >>.buildenv # display verbosity header + set +x; VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"; set -x + + # bootstrap GNU patch tool + ${l_gzip} -dc `SOURCE patch-%{V_patch}.tar.gz` | ${l_tar} xf - 2>/dev/null || true + ( cd patch-%{V_patch} + chmod u+w config.guess config.sub >/dev/null 2>&1 || true + cp `SOURCE config.guess` . + cp `SOURCE config.sub` . + ( echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}' + echo 'ac_cv_prog_cc_g=no' + false=`sh $shtool path false` + echo "ac_cv_path_ed_PROGRAM=\${ac_cv_path_ed_PROGRAM=$false}" + ) >config.cache + CC="${l_cc}" \ + ./configure \ + --cache-file=./config.cache \ + --disable-largefile + ${l_make} || exit $? + ( mv patch ..; ${l_make} clean || true; mv ../patch . ) || exit $? + ) || exit $? + l_patch="`pwd`/patch-%{V_patch}/patch"; export l_patch + echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv + + # display verbosity header + set +x; VERBOSE "BUILD: Build GNU tar (Archiving Tool)"; set -x + + # build GNU tar tool + ${l_gzip} -dc `SOURCE tar-%{V_tar}.tar.gz` | ${l_tar} xf - 2>/dev/null || true + ( cd tar-%{V_tar} + ${l_patch} -p0 <`SOURCE tar.patch` + ( echo 'am_cv_func_iconv=no' + echo 'am_cv_lib_iconv=no' + echo 'ac_cv_lib_iconv_iconv=no' + echo 'ac_cv_header_iconv_h=no' + echo 'ac_cv_type_iconv_t=no' + ) >config.cache + sh $shtool subst \ + -e 's;^rm conftest\.sed;rm -f conftest.sed;' \ + configure + CC="${l_cc}" \ + ./configure \ + --cache-file=./config.cache \ + --prefix=%{l_prefix} \ + --disable-nls + ${l_make} || exit $? + ( mv src/tar ..; ${l_make} clean || true; mv ../tar . ) || exit $? + ) || exit $? + l_tar="`pwd`/tar-%{V_tar}/tar"; export l_tar + echo "l_tar=\"$l_tar\"; export l_tar" >>.buildenv + + # display verbosity header set +x; VERBOSE "PREPARATION: Unpack Distribution Tarballs"; set -x # unpack distribution tarballs @@ -436,43 +487,20 @@ ${l_gzip} -dc `SOURCE bzip2-%{V_bzip2}.tar.gz` | ${l_tar} xf - 2>/dev/null || true ${l_gzip} -dc `SOURCE curl-%{V_curl}.tar.gz` | ${l_tar} xf - 2>/dev/null || true ${l_gzip} -dc `SOURCE make-%{V_make}.tar.gz` | ${l_tar} xf - 2>/dev/null || true - ${l_gzip} -dc `SOURCE patch-%{V_patch}.tar.gz` | ${l_tar} xf - 2>/dev/null || true - ${l_gzip} -dc `SOURCE tar-%{V_tar}.tar.gz` | ${l_tar} xf - 2>/dev/null || true ${l_gzip} -dc `SOURCE bash-%{V_bash}.tar.gz` | ${l_tar} xf - 2>/dev/null || true ${l_gzip} -dc `SOURCE uuid-%{V_uuid}.tar.gz` | ${l_tar} xf - 2>/dev/null || true ${l_gzip} -dc `SOURCE beecrypt-%{V_beecrypt}.tar.gz` | ${l_tar} xf - 2>/dev/null || true # update config.guess/config.sub for dir in rpm-%{V_rpm} rpm-%{V_rpm}/popt beecrypt-%{V_beecrypt} \ - curl-%{V_curl} make-%{V_make} patch-%{V_patch} tar-%{V_tar} \ - bash-%{V_bash}/support; do + curl-%{V_curl} make-%{V_make} bash-%{V_bash}/support; do chmod u+w $dir/config.guess $dir/config.sub >/dev/null 2>&1 || true cp `SOURCE config.guess` $dir/ cp `SOURCE config.sub` $dir/ done # display verbosity header - set +x; VERBOSE "PREPARATION: Build GNU patch (Source Patching Tool)"; set -x - - # bootstrap GNU patch tool - ( cd patch-%{V_patch} - ( echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}' - echo 'ac_cv_prog_cc_g=no' - false=`sh $shtool path false` - echo "ac_cv_path_ed_PROGRAM=\${ac_cv_path_ed_PROGRAM=$false}" - ) >config.cache - CC="${l_cc}" \ - ./configure \ - --cache-file=./config.cache \ - --disable-largefile - ${l_make} - ( mv patch ..; ${l_make} clean || true; mv ../patch . ) || exit $? - ) || exit $? - l_patch="`pwd`/patch-%{V_patch}/patch"; export l_patch - echo "l_patch=\"$l_patch\"; export l_patch" >>.buildenv - - # display verbosity header - set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distibutions"; set -x + set +x; VERBOSE "PREPARATION: Apply OpenPKG Patches to Distributions"; set -x # apply OpenPKG patches to distribution trees ( cd rpm-%{V_rpm} @@ -488,9 +516,6 @@ ( cd bash-%{V_bash} ${l_patch} -p0 <`SOURCE bash.patch` ) || exit $? - ( cd tar-%{V_tar} - ${l_patch} -p0 <`SOURCE tar.patch` - ) || exit $? ( cd beecrypt-%{V_beecrypt} ${l_patch} -p0 <`SOURCE beecrypt.patch` sh $shtool subst \ @@ -552,30 +577,6 @@ ) || exit $? # display verbosity header - set +x; VERBOSE "BUILD: Build GNU tar (Archiving Tool)"; set -x - - # build GNU tar tool - ( cd tar-%{V_tar} - ( echo 'am_cv_func_iconv=no' - echo 'am_cv_lib_iconv=no' - echo 'ac_cv_lib_iconv_iconv=no' - echo 'ac_cv_header_iconv_h=no' - echo 'ac_cv_type_iconv_t=no' - ) >config.cache - sh $shtool subst \ - -e 's;^rm conftest\.sed;rm -f conftest.sed;' \ - configure - CC="${l_cc}" \ - ../bash-%{V_bash}/bash \ - ./configure \ - --cache-file=./config.cache \ - --prefix=%{l_prefix} \ - --disable-nls - ${l_make} || exit $? - ( mv src/tar ..; ${l_make} clean || true; mv ../tar src/ ) || exit $? - ) || exit $? - - # display verbosity header set +x; VERBOSE "BUILD: Build GNU bzip2 (Compression Library)"; set -x # build BZIP2 library @@ -922,7 +923,7 @@ strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/patch ) || exit $? ( cd tar-%{V_tar} - cp src/tar $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar + cp tar $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar strip $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/tar ) || exit $? ( cd bash-%{V_bash} @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]