25f00b6cb5
Copy from Base:System/rpm based on submit request 18841 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18841 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=84
92 lines
3.2 KiB
Diff
92 lines
3.2 KiB
Diff
Many changes to Makefiles/autogen and the like to make it build
|
|
on SUSE systems.
|
|
|
|
---
|
|
autogen.sh | 16 +++--
|
|
build/Makefile.am | 2
|
|
configure.ac | 153 ++++++++++++++++++++++++++++++++-------------------
|
|
db3/configure | 6 +-
|
|
file/src/Makefile.am | 2
|
|
installplatform | 9 ++-
|
|
lib/Makefile.am | 2
|
|
popt/autogen.sh | 2
|
|
rpmdb/Makefile.am | 4 -
|
|
rpmio/Makefile.am | 10 +--
|
|
scripts/Makefile.am | 8 ++
|
|
11 files changed, 132 insertions(+), 82 deletions(-)
|
|
|
|
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -1009,6 +1009,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH=arm
|
|
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 ;;
|
|
@@ -1019,6 +1020,7 @@ esac
|
|
RPMCANONVENDOR="$build_vendor"
|
|
case "${build_vendor}" in
|
|
unknown|pc|ibm|redhat|pld|mandrake|conectiva|lvr|yellowdog|caos|suse)
|
|
+ RPMCANONVENDOR=suse
|
|
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
|
|
test -f /etc/SuSE-release && RPMCANONVENDOR=suse
|
|
test -f /etc/pld-release && RPMCANONVENDOR=pld
|
|
@@ -1031,6 +1033,9 @@ unknown|pc|ibm|redhat|pld|mandrake|conec
|
|
esac
|
|
RPMCANONOS="$host_os_noversion"
|
|
RPMCANONGNU="$host_os_gnu"
|
|
+if test "$RPMCANONVENDOR" = suse ; then
|
|
+ RPMCANONCOLOR=0
|
|
+fi
|
|
AC_SUBST(RPMCANONCOLOR)
|
|
AC_SUBST(RPMCANONARCH)
|
|
AC_SUBST(RPMCANONVENDOR)
|
|
Index: db3/configure
|
|
===================================================================
|
|
--- db3/configure.orig
|
|
+++ db3/configure
|
|
@@ -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 \
|
|
- --enable-shared --enable-static --enable-rpc \
|
|
- --with-uniquename=_rpmdb --srcdir=$db_dist
|
|
+CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \
|
|
+ --enable-shared --enable-static --enable-rpc \
|
|
+ --with-uniquename=_rpmdb --srcdir=$db_dist $ARGS
|
|
|
|
mv Makefile Makefile.orig
|
|
cat Makefile.orig | sed -e '/^install[:-]/c\
|
|
Index: installplatform
|
|
===================================================================
|
|
--- installplatform.orig
|
|
+++ installplatform
|
|
@@ -54,9 +54,9 @@ for SUBST in $SUBSTS ; do
|
|
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;;
|
|
esac
|
|
|
|
@@ -136,6 +136,9 @@ for SUBST in $SUBSTS ; do
|
|
apple)
|
|
VENDORSED='-e s,^@apple@,,'
|
|
;;
|
|
+ suse)
|
|
+ VENDORSED='-e s,^@SuSE@,,'
|
|
+ ;;
|
|
esac
|
|
|
|
CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`"
|