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: 28-Dec-2007 11:09:36
Branch: HEAD Handle: 2007122810093600
Modified files:
rpm devtool.conf
Log:
hack in universal cpu-os macros for darwin (before it was using i386
on ppc)
Summary:
Revision Changes Path
2.155 +24 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.154 -r2.155 devtool.conf
--- rpm/devtool.conf 28 Dec 2007 10:03:00 -0000 2.154
+++ rpm/devtool.conf 28 Dec 2007 10:09:36 -0000 2.155
@@ -1882,6 +1882,30 @@
mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc
mkdir -p /tmp/rpm-root/usr/local/src/rpm/RPMS/ppc64
+ if [ ".$UNIVERSAL_SDK" != "." ]; then
+ # setup architectures
+ for ARCH in ppc i386; do
+ mkdir -p /tmp/rpm-root/usr/local/lib/rpm/$ARCH-darwin
+ sed -e "s/^\\\\%/%/" <<__EOF__
>/tmp/rpm-root/usr/local/lib/rpm/$ARCH-darwin/macros
+# Per-platform rpm configuration file.
+
+#==============================================================================
+# ---- per-platform macros.
+#
+\%_arch $ARCH
+\%_build_arch $ARCH
+\%_vendor apple
+\%_os darwin
+\%_gnu %{nil}
+\%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
+\%optflags -O2 -g
+
+__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
+ fi
+
# copy required popt.h library header to internal headers
cp -p "$basemac/bin/popt-${v_popt}/popt.h"
/tmp/rpm-root/usr/local/include/rpm
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
