RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 31-Dec-2007 21:22:38
Branch: HEAD Handle: 2007123120223800
Modified files:
rpm devtool.conf
Log:
- add PCRE to "devtool standalone" procedure
- make RPM configuration in "devtool standalone" procedure more flexible
Summary:
Revision Changes Path
2.162 +74 -43 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.161 -r2.162 devtool.conf
--- rpm/devtool.conf 31 Dec 2007 10:04:24 -0000 2.161
+++ rpm/devtool.conf 31 Dec 2007 20:22:38 -0000 2.162
@@ -226,6 +226,7 @@
v_popt="1.13"
v_libxml2="2.6.30"
v_xar="1.5.2"
+ v_pcre="7.4"
v_config="20071205"
# third-party distribution files
@@ -248,6 +249,7 @@
dist="${dist} popt-${v_popt}.tar.gz,http://rpm5.org/files/3rd/,http://rpm5.org/files/popt/"
dist="${dist} libxml2-${v_libxml2}.tar.gz,http://rpm5.org/files/3rd/,ftp://xmlsoft.org/libxml2/"
dist="${dist} xar-${v_xar}.tar.gz,http://rpm5.org/files/3rd/,http://xar.googlecode.com/files/"
+ dist="${dist} pcre-${v_pcre}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/"
# third-party distribution patches (for portability and bugfix reasons only)
dist="${dist} automake-${v_automake}.patch,http://rpm5.org/files/3rd/"
@@ -261,6 +263,7 @@
dist="${dist} popt-${v_popt}.patch,http://rpm5.org/files/3rd/"
dist="${dist} libxml2-${v_libxml2}.patch,http://rpm5.org/files/3rd/"
dist="${dist} xar-${v_xar}.patch,http://rpm5.org/files/3rd/"
+ dist="${dist} pcre-${v_pcre}.patch,http://rpm5.org/files/3rd/"
dist="${dist} config.guess-${v_config},http://rpm5.org/files/3rd/"
dist="${dist} config.sub-${v_config},http://rpm5.org/files/3rd/"
}
@@ -774,11 +777,11 @@
( cd $base3rd/bin/$platform
rm -rf libxml2-${v_libxml2}
$gzip -d -c ../../src/libxml2-${v_libxml2}.tar.gz | $tar xf -
- $SHTOOL subst \
- -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
- configure
( cd libxml2-${v_libxml2}
$patch -p0 <../../../src/libxml2-${v_libxml2}.patch
+ $SHTOOL subst \
+ -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+ configure
CC="$cc" \
./configure \
--without-iconv \
@@ -811,6 +814,28 @@
) || exit $?
) || exit $?
fi
+
+ # PCRE (uninstalled third-party library)
+ if [ ! -d "$base3rd/bin/$platform/pcre-${v_pcre}" ]; then
+ echo "++ building third-party library pcre-${v_pcre}"
+ ( cd $base3rd/bin/$platform
+ rm -rf pcre-${v_pcre}
+ $gzip -d -c ../../src/pcre-${v_pcre}.tar.gz | $tar xf -
+ ( cd pcre-${v_pcre}
+ $patch -p0 <../../../src/pcre-${v_pcre}.patch
+ $SHTOOL subst \
+ -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
+ configure
+ CC="$cc" \
+ GREP="grep" \
+ ./configure \
+ --disable-cpp \
+ --disable-utf8 \
+ --disable-shared
+ make
+ ) || exit $?
+ ) || exit $?
+ fi
}
# configure build environment
@@ -843,46 +868,52 @@
export CPPFLAGS
export LDFLAGS
export LIBS
- ${DEVTOOL_SRCDIR}/configure -v \
- --prefix="$prefix" \
- --mandir="$prefix/man" \
- --with-path-cfg="$prefix/etc/rpm" \
- --with-path-rpmpopt="$prefix/lib/rpm/rpmpopt:$prefix/etc/rpm/rpmpopt:~/.rpmpopt" \
- --with-path-macros="$prefix/lib/rpm/macros:$prefix/etc/rpm/macros:~/.rpmmacros" \
- --with-path-lib="$prefix/lib/rpm" \
- --with-path-locale="$prefix/share/rpm/locale" \
- --with-path-database="$prefix/var/rpm/db" \
- --with-path-sources="$prefix/var/rpm/src" \
- --with-bugreport="openpkg-users@openpkg.org" \
- --with-beecrypt="$base3rd/bin/$platform/beecrypt-${v_beecrypt}" \
- --with-lua="$base3rd/bin/$platform/lua-${v_lua}/src" \
- --with-file="$base3rd/bin/$platform/file-${v_file}" \
- --with-zlib="$base3rd/bin/$platform/zlib-${v_zlib}" \
- --with-bzip2="$base3rd/bin/$platform/bzip2-${v_bzip2}" \
- --with-neon="$base3rd/bin/$platform/neon-${v_neon}" \
- --with-popt="$base3rd/bin/$platform/popt-${v_popt}" \
- --with-xar="$base3rd/bin/$platform/xar-${v_xar}" \
- --with-sqlite="$base3rd/bin/$platform/sqlite-${v_sqlite}" \
- --with-db="$base3rd/bin/$platform/db-${v_db}/build_unix" \
- --without-db-rpc \
- --without-db-largefile \
- --with-db-tools-integrated \
- --with-db-mutex="UNIX/fcntl" \
- --without-pthreads \
- --without-libelf \
- --without-selinux \
- --without-perl \
- --without-python \
- --without-apidocs \
- --disable-build-intlibdep \
- --disable-build-extlibdep \
- --disable-build-lafiles \
- --enable-build-warnings \
- --enable-build-debug \
- --disable-build-lib64 \
- --disable-shared \
- --disable-rpath \
- --disable-nls
+ OPTION=""
+ OPTION="$OPTION --prefix=\"$prefix\""
+ OPTION="$OPTION --mandir=\"$prefix/man\""
+ OPTION="$OPTION --with-path-cfg=\"$prefix/etc/rpm\""
+ OPTION="$OPTION --with-path-rpmpopt=\"$prefix/lib/rpm/rpmpopt:$prefix/etc/rpm/rpmpopt:~/.rpmpopt\""
+ OPTION="$OPTION --with-path-macros=\"$prefix/lib/rpm/macros:$prefix/etc/rpm/macros:~/.rpmmacros\""
+ OPTION="$OPTION --with-path-lib=\"$prefix/lib/rpm\""
+ OPTION="$OPTION --with-path-locale=\"$prefix/share/rpm/locale\""
+ OPTION="$OPTION --with-path-database=\"$prefix/var/rpm/db\""
+ OPTION="$OPTION --with-path-sources=\"$prefix/var/rpm/src\""
+ OPTION="$OPTION --with-bugreport=\"openpkg-users@openpkg.org\""
+ OPTION="$OPTION --with-beecrypt=\"$base3rd/bin/$platform/beecrypt-${v_beecrypt}\""
+ if [ ".$RPM_VENDOR_OPENPKG" != . ]; then
+ OPTION="$OPTION --with-lua=\"internal\""
+ else
+ OPTION="$OPTION --with-lua=\"$base3rd/bin/$platform/lua-${v_lua}/src\""
+ fi
+ OPTION="$OPTION --with-pcre=\"$base3rd/bin/$platform/pcre-${v_pcre}\""
+ OPTION="$OPTION --with-file=\"$base3rd/bin/$platform/file-${v_file}\""
+ OPTION="$OPTION --with-zlib=\"$base3rd/bin/$platform/zlib-${v_zlib}\""
+ OPTION="$OPTION --with-bzip2=\"$base3rd/bin/$platform/bzip2-${v_bzip2}\""
+ OPTION="$OPTION --with-neon=\"$base3rd/bin/$platform/neon-${v_neon}\""
+ OPTION="$OPTION --with-popt=\"$base3rd/bin/$platform/popt-${v_popt}\""
+ OPTION="$OPTION --with-xar=\"$base3rd/bin/$platform/xar-${v_xar}\""
+ OPTION="$OPTION --with-sqlite=\"$base3rd/bin/$platform/sqlite-${v_sqlite}\""
+ OPTION="$OPTION --with-db=\"$base3rd/bin/$platform/db-${v_db}/build_unix\""
+ OPTION="$OPTION --without-db-rpc"
+ OPTION="$OPTION --without-db-largefile"
+ OPTION="$OPTION --with-db-tools-integrated"
+ OPTION="$OPTION --with-db-mutex=\"UNIX/fcntl\""
+ OPTION="$OPTION --without-pthreads"
+ OPTION="$OPTION --without-libelf"
+ OPTION="$OPTION --without-selinux"
+ OPTION="$OPTION --without-perl"
+ OPTION="$OPTION --without-python"
+ OPTION="$OPTION --without-apidocs"
+ OPTION="$OPTION --disable-build-intlibdep"
+ OPTION="$OPTION --disable-build-extlibdep"
+ OPTION="$OPTION --disable-build-lafiles"
+ OPTION="$OPTION --enable-build-warnings"
+ OPTION="$OPTION --enable-build-debug"
+ OPTION="$OPTION --disable-build-lib64"
+ OPTION="$OPTION --disable-shared"
+ OPTION="$OPTION --disable-rpath"
+ OPTION="$OPTION --disable-nls"
+ eval "${DEVTOOL_SRCDIR}/configure -v $OPTION"
}
# build RPM
@@ .
Received on Mon Dec 31 21:22:38 2007