2006-12-19 00:17:44 +01:00
|
|
|
Many changes to Makefiles/autogen and the like to make it build
|
|
|
|
|
on SUSE systems.
|
|
|
|
|
|
2010-03-26 11:56:28 +01:00
|
|
|
--- ./configure.ac.orig 2010-03-24 16:35:40.000000000 +0000
|
|
|
|
|
+++ ./configure.ac 2010-03-25 15:16:21.000000000 +0000
|
|
|
|
|
@@ -1006,6 +1006,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm
|
2008-09-12 20:37:28 +02:00
|
|
|
mipsel*) RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;;
|
|
|
|
|
mips*) RPMCANONCOLOR=0; RPMCANONARCH=mips ;;
|
|
|
|
|
m68k*) RPMCANONCOLOR=0; RPMCANONARCH=m68k ;;
|
|
|
|
|
+parisc*|hppa*) RPMCANONCOLOR=0; RPMCANONARCH=hppa ;;
|
|
|
|
|
sh3*) RPMCANONCOLOR=0; RPMCANONARCH=sh3 ;;
|
|
|
|
|
sh4*) RPMCANONCOLOR=0; RPMCANONARCH=sh4 ;;
|
|
|
|
|
*) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;;
|
2010-03-26 11:56:28 +01:00
|
|
|
@@ -1016,6 +1017,7 @@ esac
|
2008-09-12 20:37:28 +02:00
|
|
|
RPMCANONVENDOR="$build_vendor"
|
|
|
|
|
case "${build_vendor}" in
|
2009-08-28 15:54:03 +02:00
|
|
|
unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
|
2008-09-12 20:37:28 +02:00
|
|
|
+ RPMCANONVENDOR=suse
|
|
|
|
|
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
|
2009-08-28 15:54:03 +02:00
|
|
|
test -f /etc/SuSE-release && RPMCANONVENDOR=suse
|
2008-09-12 20:37:28 +02:00
|
|
|
test -f /etc/pld-release && RPMCANONVENDOR=pld
|
2010-03-26 11:56:28 +01:00
|
|
|
@@ -1028,6 +1030,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
|
2008-09-12 20:37:28 +02:00
|
|
|
esac
|
2009-08-28 15:54:03 +02:00
|
|
|
RPMCANONOS="$host_os_noversion"
|
|
|
|
|
RPMCANONGNU="$host_os_gnu"
|
2008-09-12 20:37:28 +02:00
|
|
|
+if test "$RPMCANONVENDOR" = suse ; then
|
|
|
|
|
+ RPMCANONCOLOR=0
|
|
|
|
|
+fi
|
|
|
|
|
AC_SUBST(RPMCANONCOLOR)
|
2009-08-28 15:54:03 +02:00
|
|
|
AC_SUBST(RPMCANONARCH)
|
|
|
|
|
AC_SUBST(RPMCANONVENDOR)
|
2010-03-26 11:56:28 +01:00
|
|
|
--- ./db3/configure.orig 2009-12-07 14:36:49.000000000 +0000
|
|
|
|
|
+++ ./db3/configure 2010-03-25 15:17:41.000000000 +0000
|
2008-10-06 16:13:13 +02:00
|
|
|
@@ -10,9 +10,9 @@ rm -f config.cache
|
|
|
|
|
# XXX edit CFLAGS= ... out of invocation args ???
|
|
|
|
|
ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
|
|
|
|
|
|
|
|
|
|
-CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
|
|
|
|
|
+CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \
|
2010-03-26 11:56:28 +01:00
|
|
|
--enable-shared --enable-static \
|
|
|
|
|
- --with-uniquename=_rpmdb --srcdir=$db_dist
|
2008-10-06 16:13:13 +02:00
|
|
|
+ --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS
|
|
|
|
|
|
|
|
|
|
mv Makefile Makefile.orig
|
|
|
|
|
cat Makefile.orig | sed -e '/^install[:-]/c\
|
2010-03-26 11:56:28 +01:00
|
|
|
--- ./installplatform.orig 2009-12-07 14:36:49.000000000 +0000
|
|
|
|
|
+++ ./installplatform 2010-03-25 15:16:21.000000000 +0000
|
|
|
|
|
@@ -47,9 +47,9 @@ for SUBST in $SUBSTS ; do
|
2009-08-28 15:54:03 +02:00
|
|
|
ARCH_INSTALL_POST='%{nil}'
|
|
|
|
|
case "${ARCH}-${OS}" in
|
|
|
|
|
sparc64*-linux) LIB=lib64 ;;
|
|
|
|
|
- s390x-linux) LIB=lib64 ;;
|
|
|
|
|
- ppc64-linux|powerpc64-linux) LIB=lib64 ;;
|
|
|
|
|
- x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64 ;;
|
|
|
|
|
+ s390x-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux ; LIB=lib64 ;;
|
|
|
|
|
+ ppc64-linux|powerpc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux ; LIB=lib64 ;;
|
|
|
|
|
+ x86_64-linux|amd64-linux|ia32e-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-lib64-linux ; LIB=lib64 ;;
|
|
|
|
|
*) LIB=lib;;
|
2008-10-06 16:13:13 +02:00
|
|
|
esac
|
|
|
|
|
|
2010-03-26 11:56:28 +01:00
|
|
|
@@ -129,6 +129,9 @@ for SUBST in $SUBSTS ; do
|
2008-10-06 16:13:13 +02:00
|
|
|
apple)
|
|
|
|
|
VENDORSED='-e s,^@apple@,,'
|
|
|
|
|
;;
|
|
|
|
|
+ suse)
|
|
|
|
|
+ VENDORSED='-e s,^@SuSE@,,'
|
|
|
|
|
+ ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`"
|
