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: 27-Dec-2007 21:24:16
Branch: HEAD Handle: 2007122720241600
Modified files:
rpm devtool.conf
Log:
configure universal cxx too
Summary:
Revision Changes Path
2.153 +9 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.152 -r2.153 devtool.conf
--- rpm/devtool.conf 27 Dec 2007 16:49:03 -0000 2.152
+++ rpm/devtool.conf 27 Dec 2007 20:24:16 -0000 2.153
@@ -1353,6 +1353,7 @@
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"
@@ -1365,6 +1366,7 @@
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"
@@ -1377,6 +1379,7 @@
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"
@@ -1427,6 +1430,7 @@
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"
@@ -1749,14 +1753,18 @@
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
LIBS="$LIBS -lssl -lcrypto" # shameless workaround for Neon
export CPP
export CC
+ export CXX
export CPPFLAGS
export CFLAGS
+ export CXXFLAGS
export LDFLAGS
export LIBS
${DEVTOOL_SRCDIR}/configure $UNIVERSAL_TARGET -v \
@@ -1860,6 +1868,7 @@
# 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}/doc,%{_usr}/share/doc,'
/tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_prefix}/etc,/etc,' /tmp/rpm-root/usr/local/lib/rpm/macros
sed -i -e 's,%{_prefix}/var,/var/local,'
/tmp/rpm-root/usr/local/lib/rpm/macros
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
