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: 25-Aug-2003 12:46:14
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082511461400
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec
Log:
bugfix MKDIR stuff again and disable building with debug symbols in
general to reduce disk space requirements again a little bit more
Summary:
Revision Changes Path
1.192.2.16 +20 -7 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.15 -r1.192.2.16 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 25 Aug 2003 10:12:19 -0000 1.192.2.15
+++ openpkg-src/openpkg/openpkg.spec 25 Aug 2003 10:46:14 -0000 1.192.2.16
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030823
+%define V_openpkg 20030824
# the used software versions
%define V_rpm 4.2.1
@@ -309,7 +309,10 @@
# bootstrap GNU zip tool
${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
( cd gzip-%{V_gzip}
- CC="${l_cc}" ./configure
+ echo "ac_cv_prog_cc_g=no" >config.cache
+ CC="${l_cc}" \
+ ./configure \
+ --cache-file=./config.cache
${l_make}
) || exit $?
l_gzip="`pwd`/gzip-%{V_gzip}/gzip"; export l_gzip
@@ -338,9 +341,12 @@
# bootstrap GNU patch tool
( cd patch-%{V_patch}
echo 'ac_cv_func_setmode=${ac_cv_func_setmode=no}' >config.cache
+ echo "ac_cv_prog_cc_g=no" >>config.cache
false=`sh $shtool path false`
echo "ac_cv_path_ed_PROGRAM=\${ac_cv_path_ed_PROGRAM=$false}" >>config.cache
- CC="${l_cc}" ./configure --disable-largefile
+ CC="${l_cc}" \
+ ./configure \
+ --disable-largefile
${l_make}
( mv patch ..; ${l_make} clean || true; mv ../patch . ) || exit $?
) || exit $?
@@ -353,7 +359,6 @@
${l_patch} -p0 <`SOURCE rpm.patch.feature`
${l_patch} -p0 <`SOURCE rpm.patch.porting`
${l_patch} -p0 <`SOURCE rpm.patch.regen`
- touch aclocal.m4 configure
) || exit $?
( cd make-%{V_make}
${l_patch} -p0 <`SOURCE make.patch`
@@ -361,7 +366,10 @@
# bootstrap GNU make tool
( cd make-%{V_make}
- CC="${l_cc}" ./configure --disable-nls --disable-largefile
+ CC="${l_cc}" \
+ ./configure \
+ --disable-nls \
+ --disable-largefile
${l_make}
( mv make ..; ${l_make} clean || true; mv ../make . ) || exit $?
) || exit $?
@@ -388,6 +396,8 @@
echo "ac_cv_func_textdomain=no"
echo "ac_cv_func_bindtextdomain=no"
echo "ac_cv_lib_intl_bindtextdomain=no"
+ # disable building with debug symbols
+ echo "ac_cv_prog_cc_g=no"
) >config.cache
CC="${l_cc}"
./configure \
@@ -405,6 +415,7 @@
echo 'am_cv_func_iconv=${am_cv_func_iconv=no}' >config.cache
echo 'am_cv_lib_iconv=${am_cv_lib_iconv=no}' >config.cache
echo 'am_cv_func_iconv=${am_cv_func_iconv=no}' >config.cache
+ echo 'ac_cv_prog_cc_g=no' >config.cache
sh $shtool subst -e 's;^rm conftest.sed;rm -f conftest.sed;' configure
CC="${l_cc}"
../bash-%{V_bash}/bash \
@@ -515,8 +526,8 @@
mv rpmio/macro.c.n rpmio/macro.c
( echo 'ac_cv_path_MSGFMT=${ac_cv_path_MSGFMT=no}'
echo 'ac_cv_path_GMSGFMT=${ac_cv_path_GMSGFMT=no}'
- echo "ac_cv_path_MKDIR=%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m 755"
- echo "ac_cv_path___MKDIR=%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m 755"
+ echo "ac_cv_path_MKDIR='%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m 755'"
+ echo "ac_cv_path___MKDIR='%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m
755'"
echo "ac_cv_path___PYTHON=true"
echo "ac_cv_path___DOXYGEN=true"
echo "acl_cv_rpath=no"
@@ -527,6 +538,8 @@
# kill linux-preconfigured db header, the makefile will symlink the
# header that is configured for the current system
rm -f rpmdb/db.h
+ touch configure
+ touch config.h.in
CC="${l_cc} -DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
CFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
CPPFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
