RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 03-Nov-2007 12:14:14
Branch: HEAD Handle: 2007110311141400
Modified files:
rpm devtool.conf
Log:
move CPP to variable to not break non-SDK build
Summary:
Revision Changes Path
2.112 +10 -4 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.111 -r2.112 devtool.conf
--- rpm/devtool.conf 3 Nov 2007 10:34:05 -0000 2.111
+++ rpm/devtool.conf 3 Nov 2007 11:14:14 -0000 2.112
@@ -1262,8 +1262,9 @@
%panther
MACOSX_DEPLOYMENT_TARGET=10.3
export MACOSX_DEPLOYMENT_TARGET
- UNIVERSAL_CC="gcc-3.3"; export
PATH="$PATH:/usr/libexec/gcc/darwin/ppc/3.3" # horrible Intel workaround
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_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"
@@ -1273,8 +1274,9 @@
%tiger
MACOSX_DEPLOYMENT_TARGET=10.4
export MACOSX_DEPLOYMENT_TARGET
- UNIVERSAL_CC="gcc-4.0"
UNIVERSAL_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
+ UNIVERSAL_CPP="gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}"
+ UNIVERSAL_CC="gcc-4.0"
UNIVERSAL_CPPFLAGS=""
UNIVERSAL_CFLAGS="-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386"
UNIVERSAL_LDFLAGS="-arch ppc -arch i386"
@@ -1284,8 +1286,9 @@
%leopard
MACOSX_DEPLOYMENT_TARGET=10.5
export MACOSX_DEPLOYMENT_TARGET
- UNIVERSAL_CC="gcc-4.0"
UNIVERSAL_SDK="/Developer/SDKs/MacOSX10.5.sdk"
+ UNIVERSAL_CPP="gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}"
+ UNIVERSAL_CC="gcc-4.0"
UNIVERSAL_CPPFLAGS=""
UNIVERSAL_CFLAGS="-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386"
UNIVERSAL_LDFLAGS="-arch ppc -arch i386"
@@ -1328,6 +1331,7 @@
# determine some local tools
SHTOOL="`cd ${DEVTOOL_SRCDIR} && pwd`/devtool.shtool"
+ test ".$UNIVERSAL_CPP" == "." && UNIVERSAL_CPP="gcc -E"
test ".$UNIVERSAL_CC" == "." && UNIVERSAL_CC="gcc"
# third-party base directory
@@ -1646,6 +1650,7 @@
echo "++ configuring build environment"
basemac="`cd $basemac && pwd`"
+ CPP="$UNIVERSAL_CPP"
CC="$UNIVERSAL_CC"
CPPFLAGS="$UNIVERSAL_CPPFLAGS"
CFLAGS="-O2 -g $UNIVERSAL_CFLAGS"
@@ -1653,6 +1658,7 @@
LIBS="$LIBS -lssl -lcrypto" # shameless workaround for Neon
CPPFLAGS="$CPPFLAGS -I/tmp/xar-root/usr/local/include"
LDFLAGS="$LDFLAGS -L/tmp/xar-root/usr/local/lib"
+ export CPP
export CC
export CPPFLAGS
export CFLAGS
@@ -1690,7 +1696,7 @@
if [ -d "${DEVTOOL_SRCDIR}/xar" ]; then
( mkdir -p xar; cd xar
( echo "=== configuring in xar (`pwd`)"
- CPP="$UNIVERSAL_CC -E -isysroot ${UNIVERSAL_SDK}" \
+ CPP="$UNIVERSAL_CPP" \
CC="$UNIVERSAL_CC" \
CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
