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: 13-Sep-2007 18:04:31
Branch: HEAD Handle: 2007091317043000
Modified files:
rpm devtool.conf
Log:
add xar and txar, to my macosx target
Summary:
Revision Changes Path
2.99 +30 -1 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.98 -r2.99 devtool.conf
--- rpm/devtool.conf 5 Sep 2007 23:00:23 -0000 2.98
+++ rpm/devtool.conf 13 Sep 2007 16:04:30 -0000 2.99
@@ -1626,6 +1626,7 @@
configure () {
echo "++ cleaning up build environment"
( cd ${DEVTOOL_SRCDIR}; make distclean || true ) >/dev/null 2>&1
+ ( cd ${DEVTOOL_SRCDIR}/xar; make distclean || true ) >/dev/null 2>&1
echo "++ configuring build environment"
basemac="`cd $basemac && pwd`"
@@ -1634,6 +1635,8 @@
CFLAGS="-O2 -g $UNIVERSAL_CFLAGS"
LDFLAGS="$UNIVERSAL_LDFLAGS -Wl,-search_paths_first" # static
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 CC
export CPPFLAGS
export CFLAGS
@@ -1668,15 +1671,37 @@
--enable-shared \
--disable-rpath \
--disable-nls
+
+ # XAR (uninstalled internal library)
+ if [ -d "${DEVTOOL_SRCDIR}/xar" ]; then
+ ( mkdir -p xar; cd xar
+ ( CC="$UNIVERSAL_CC" \
+ CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
+ CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
+ LDFLAGS="$UNIVERSAL_LDFLAGS" \
+ echo "=== configuring in xar (`pwd`)"
+ ${DEVTOOL_SRCDIR}/xar/configure $UNIVERSAL_TARGET \
+ --prefix=/usr/local \
+ --disable-shared
+ ) || exit $?
+ ) || exit $?
+ fi
}
# do all at once
prepare
- %checkout
+ #%checkout
+ %checkout xar
%autogen
+ ( cd ${DEVTOOL_SRCDIR}/xar && sh autogen.sh )
configure
gnumake
+ # build xar into a temporary destroot, then build txar
+ gnumake -C xar all install DESTDIR=/tmp/xar-root
+ perl -pe 's,-lxar,/tmp/xar-root/usr/local/lib/libxar.la,' -i
tools/Makefile
+ gnumake -C tools txar
+
# perl's MakeMaker ignores our -search_paths_first, and links with
system libs :-(
make -C perl LD="ld -search_paths_first" MACOSX_DEPLOYMENT_TARGET="10.3"
clean all
@@ -1731,6 +1756,10 @@
# 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
+ # copy the internal txar tool over, for testing purposes
+ cp -p tools/.libs/txar /tmp/rpm-root/usr/local/lib/rpm
+ strip -S /tmp/rpm-root/usr/local/lib/rpm/txar
+
# strip debugging symbols, and remove libtool files (.la)
strip -S /tmp/rpm-root/usr/local/bin/*
strip -S /tmp/rpm-root/usr/local/lib/rpm/db_*
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
