RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: afb@rpm5.org
Module: rpm Date: 01-Sep-2010 11:01:47
Branch: HEAD Handle: 2010090109014700
Modified files:
rpm devtool.conf
Log:
devtool: rip out %tiger universal
Summary:
Revision Changes Path
2.345 +12 -131 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.344 -r2.345 devtool.conf
--- rpm/devtool.conf 1 Sep 2010 08:32:08 -0000 2.344
+++ rpm/devtool.conf 1 Sep 2010 09:01:47 -0000 2.345
@@ -1350,74 +1350,16 @@
standalone_testdrive
}
-%afb
- %tiger
-
-%panther
- MACOSX_DEPLOYMENT_TARGET=10.3
- export MACOSX_DEPLOYMENT_TARGET
- UNIVERSAL_SDK="/Developer/SDKs/MacOSX10.3.9.sdk"
- UNIVERSAL_CPP="gcc-3.3 -E"
- UNIVERSAL_CC="gcc-3.3"; export PATH="$PATH:/usr/libexec/gcc/darwin/ppc/3.3" # horrible Intel workaround
- UNIVERSAL_CXX="g++-3.3"
- UNIVERSAL_CPPFLAGS="-I${UNIVERSAL_SDK}/usr/include"
- UNIVERSAL_CFLAGS="-isystem ${UNIVERSAL_SDK}/usr/include -isystem ${UNIVERSAL_SDK}/usr/include/gcc/darwin/3.3 -arch ppc"
- UNIVERSAL_LDFLAGS="-Wl,-syslibroot,${UNIVERSAL_SDK} -arch ppc"
- UNIVERSAL_TARGET="--host powerpc-apple-darwin7 --target powerpc-apple-darwin7"
- platform=Panther
- @source %macosx
-
-%tiger
- MACOSX_DEPLOYMENT_TARGET=10.4
- export MACOSX_DEPLOYMENT_TARGET
- UNIVERSAL_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
- UNIVERSAL_CPP="gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}"
- UNIVERSAL_CC="gcc-4.0"
- UNIVERSAL_CXX="g++-4.0"
- UNIVERSAL_CPPFLAGS=""
- UNIVERSAL_CFLAGS="-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386"
- UNIVERSAL_LDFLAGS="-arch ppc -arch i386"
- UNIVERSAL_TARGET="--host i686-apple-darwin8 --target i686-apple-darwin8"
- platform=Tiger
- @source %macosx
-
-%leopard
- MACOSX_DEPLOYMENT_TARGET=10.5
- export MACOSX_DEPLOYMENT_TARGET
- UNIVERSAL_SDK="/Developer/SDKs/MacOSX10.5.sdk"
- UNIVERSAL_CPP="gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}"
- UNIVERSAL_CC="gcc-4.0"
- UNIVERSAL_CXX="g++-4.0"
- UNIVERSAL_CPPFLAGS=""
- UNIVERSAL_CFLAGS="-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386"
- UNIVERSAL_LDFLAGS="-arch ppc -arch i386"
- UNIVERSAL_TARGET="--host i686-apple-darwin9 --target i686-apple-darwin9"
- platform=Leopard
- @source %macosx
-
%darwin
%macosx
%macosx
##
- ## Builds a Universal Binary (ppc/i386), on the Mac OS X 10.x platforms.
- ## (this target is heavilly inspired by the OpenPKG "standalone" target)
- ##
- ## Written by Anders F Bjorklund in memoriam of the rpm4darwin project
- ## which provided the legacy RPM 4.0 to 4.3, for Mac OS X 10.1 to 10.4
- ## It can also be used if you want access to the RPM tools or libraries
- ## from RPM, without having to install all requirements from MacPorts.
- ##
## These tools are built local: m4, autoconf, automake, libtool, gettext
## (the system-provided versions are too old, and thus cannot be used...)
## Note: "libtool" is called "glibtool" on the Darwin platform, due to a
## name conflict with the system linker which is also called libtool(1)
##
- ## Shipped programs/libraries are built as Universal Binaries (i.e. fat)
- ## with: -isysroot /Developer/SDKs/MacOSX10.x.sdk -arch ppc -arch i386
- ## This also requires --disable-dependency-tracking, since it doesn't
- ## work with multiple -arch flags (see Apple's Technical Note TN2137)
- ##
## These libraries are built internally: db, lua, syck, file, xar, xz
## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
## (building popt statically requires that the required popt.h header
@@ -1434,19 +1376,10 @@
# determine some local tools
SHTOOL="`cd ${DEVTOOL_SRCDIR} && pwd`/devtool.shtool"
- if [ ".$UNIVERSAL_SDK" != "." ]; then
- if [ ! -d "$UNIVERSAL_SDK" ]; then
- echo "devtool:ERROR: sorry, \"$UNIVERSAL_SDK\" is missing" 1>&2
- exit 1
- fi
- fi
- test ".$UNIVERSAL_CPP" == "." && UNIVERSAL_CPP="gcc -E"
- test ".$UNIVERSAL_CC" == "." && UNIVERSAL_CC="gcc"
- test ".$UNIVERSAL_CXX" == "." && UNIVERSAL_CXX="g++"
# third-party base directory
basemac="${DEVTOOL_SRCDIR}/../mac"
- test ".$platform" == "." && platform="MacOSX" # needs subdir
+ platform="MacOSX" # needs subdir
# prepare build environment
prepare () {
@@ -1472,8 +1405,6 @@
PATH="$PATH:/bin:/usr/bin:/sbin:/usr/sbin"
export PATH
- ### development tools (host native)
-
# GNU m4 (installed development tool)
if [ ! -d "$basemac/bin/m4-${v_m4}" ]; then
echo "++ building third-party development tool m4-${v_m4}"
@@ -1621,8 +1552,6 @@
) || exit $?
fi
- ### universal binaries (cross-compiled)
-
# Expat (uninstalled third-party library)
if [ ! -d "$basemac/bin/$platform/expat-${v_expat}" ]; then
echo "++ building third-party library expat-${v_expat}"
@@ -1630,11 +1559,7 @@
rm -rf expat-${v_expat}
gzip -d -c ../../src/expat-${v_expat}.tar.gz | gnutar xf -
( cd expat-${v_expat}
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
- LDFLAGS="$UNIVERSAL_LDFLAGS" \
- ./configure $UNIVERSAL_TARGET \
+ ./configure \
--disable-shared
make libexpat.la
) || exit $?
@@ -1650,12 +1575,9 @@
( cd neon-${v_neon}
( echo "ac_cv_path_KRB5_CONFIG="
) >config.cache
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
CPPFLAGS="-I`pwd`/../expat-${v_expat}/lib" \
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
- LDFLAGS="-L`pwd`/../expat-${v_expat}/lib -L`pwd`/../expat-${v_expat}/.libs $UNIVERSAL_LDFLAGS" \
- ./configure $UNIVERSAL_TARGET \
+ LDFLAGS="-L`pwd`/../expat-${v_expat}/lib -L`pwd`/../expat-${v_expat}/.libs" \
+ ./configure \
--cache-file=./config.cache \
--with-libs=/tmp \
--with-ssl=openssl \
@@ -1698,11 +1620,7 @@
echo 'ac_cv_func_gettimeofday=yes'
echo 'bc_cv_as_noexecstack=no'
) >config.cache
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
- LDFLAGS="$UNIVERSAL_LDFLAGS" \
- ./configure $UNIVERSAL_TARGET \
+ ./configure \
--cache-file=./config.cache \
--without-cplusplus \
--without-java \
@@ -1722,11 +1640,7 @@
gzip -d -c ../../src/sqlite-${v_sqlite}.tar.gz | gnutar xf -
( cd sqlite-${v_sqlite}
patch -p0 <../../../src/sqlite-${v_sqlite}.patch
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
- CFLAGS="-O2 -g -fno-common $UNIVERSAL_CFLAGS" \
- LDFLAGS="$UNIVERSAL_LDFLAGS" \
- ./configure $UNIVERSAL_TARGET \
+ ./configure \
--disable-readline \
--disable-threadsafe \
--disable-debug \
@@ -1746,11 +1660,8 @@
gzip -d -c ../../src/popt-${v_popt}.tar.gz | gnutar xf -
( cd popt-${v_popt}
patch -p0 <../../../src/popt-${v_popt}.patch
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS -DPOPT_fprintf=fprintf" \
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
- LDFLAGS="$UNIVERSAL_LDFLAGS" \
- ./configure $UNIVERSAL_TARGET \
+ CPPFLAGS="-DPOPT_fprintf=fprintf" \
+ ./configure \
--disable-dependency-tracking \
--disable-shared \
--with-included-gettext \
@@ -1770,12 +1681,8 @@
gzip -d -c ../../src/pcre-${v_pcre}.tar.gz | gnutar xf -
( cd pcre-${v_pcre}
patch -p0 <../../../src/pcre-${v_pcre}.patch
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
- LDFLAGS="$UNIVERSAL_LDFLAGS" \
GREP="grep" \
- ./configure $UNIVERSAL_TARGET \
+ ./configure \
--disable-dependency-tracking \
--disable-cpp \
--disable-utf8 \
@@ -1795,12 +1702,8 @@
$SHTOOL subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
- CC="$UNIVERSAL_CC" \
- CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
- LDFLAGS="$UNIVERSAL_LDFLAGS" \
GREP="grep" \
- ./configure $UNIVERSAL_TARGET \
+ ./configure \
--disable-shared
make
) || exit $?
@@ -1815,13 +1718,7 @@
echo "++ configuring build environment"
basemac="`cd $basemac && pwd`"
- CPP="$UNIVERSAL_CPP"
- CC="$UNIVERSAL_CC"
- CXX="$UNIVERSAL_CXX"
- CPPFLAGS="$UNIVERSAL_CPPFLAGS"
- CFLAGS="-O2 -g $UNIVERSAL_CFLAGS"
- CXXFLAGS="-O2 -g $UNIVERSAL_CFLAGS"
- LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-search_paths_first" # static
+ LDFLAGS="-Wl,-search_paths_first" # static
LIBS="$LIBS -lssl -lcrypto" # shameless workaround for Neon
LDFLAGS="$LDFLAGS -L`pwd`/xar/lib/.libs" # Xar linking hack
DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:`pwd`/xar/lib/.libs"
@@ -1829,16 +1726,11 @@
DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:`pwd`/xz/src/liblzma/.libs"
CPPFLAGS="$CPPFLAGS -I$basemac/bin/$platform/expat-${v_expat}/lib" # lua
LDFLAGS="$LDFLAGS -L$basemac/bin/$platform/expat-${v_expat}/.libs" # lua
- export CPP
- export CC
- export CXX
export CPPFLAGS
- export CFLAGS
- export CXXFLAGS
export LDFLAGS
export LIBS
export DYLD_LIBRARY_PATH
- ${DEVTOOL_SRCDIR}/configure $UNIVERSAL_TARGET -v \
+ ${DEVTOOL_SRCDIR}/configure -v \
--prefix=/usr/local \
--sysconfdir=/private/etc \
--localstatedir=/private/var/local \
@@ -1850,8 +1742,6 @@
--disable-aio \
--with-glob \
--enable-broken-chown \
- --with-dbapi=db \
- --with-bugreport="afb@rpm5.org" \
--with-db=internal \
--with-tcl=external \
--with-lua=internal \
@@ -1931,9 +1821,6 @@
chmod 1775 /tmp/rpm-root/Library
# setup default (undetected) configuration, for Mac OS X
- sed -i -e "s,${UNIVERSAL_CPP},gcc -E," /tmp/rpm-root/usr/local/lib/rpm/macros
- sed -i -e "s,${UNIVERSAL_CC},gcc," /tmp/rpm-root/usr/local/lib/rpm/macros
- sed -i -e "s,${UNIVERSAL_CXX},g++," /tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e "s,/usr/bin/perl,perl," /tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e "s,/usr/local/bin/perl,perl," /tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e "s,/usr/bin/python,python," /tmp/rpm-root/usr/local/lib/rpm/macros
@@ -1953,7 +1840,6 @@
mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc64
mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/fat
- if [ ".$UNIVERSAL_SDK" != "." ]; then
# setup CVOG platform
cat <<__EOF__ >/tmp/rpm-root/private/etc/rpm/platform
i386-apple-darwin
@@ -1987,11 +1873,6 @@
__EOF__
done
- perl -pi -e "s/^\%_arch.*/\%_arch\t\t\tfat/g;s/^\%_build_arch.*/\%_build_arch\t\tfat/g" \
- /tmp/rpm-root/usr/local/lib/rpm/macros
- perl -pi -e "s/^(\%optflags)(\s+)(.*)/\$1\$2\$3 -arch i386 -arch ppc/g" \
- /tmp/rpm-root/usr/local/lib/rpm/macros
- fi
# copy required popt.h library header to internal headers
cp -p "$basemac/bin/$platform/popt-${v_popt}/popt.h" /tmp/rpm-root/usr/local/include/rpm
@@ .
Received on Wed Sep 1 11:01:48 2010