RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: rse@rpm5.org
Module: rpm Date: 26-Jul-2007 10:10:33
Branch: HEAD Handle: 2007072609103003
Modified files:
rpm CHANGES configure.ac devtool.conf
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/python/rpm Makefile.am
rpm/rpmconstant Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
rpm/scripts Makefile.am
Log:
Follow rpm.org and finally drop the ugly MARK64 hack at all as it isn't
really RPM's business to decide for lib64 -- for this there exists for
the user (or packager) the standardized way of using the Autoconf option
--libdir.
Summary:
Revision Changes Path
1.1525 +1 -0 rpm/CHANGES
2.68 +1 -1 rpm/build/Makefile.am
2.224 +1 -18 rpm/configure.ac
2.81 +0 -1 rpm/devtool.conf
2.163 +1 -1 rpm/lib/Makefile.am
1.30 +1 -1 rpm/misc/Makefile.am
1.2 +1 -1 rpm/python/rpm/Makefile.am
1.8 +2 -2 rpm/rpmconstant/Makefile.am
1.76 +1 -1 rpm/rpmdb/Makefile.am
1.101 +1 -1 rpm/rpmio/Makefile.am
1.44 +1 -1 rpm/scripts/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1524 -r1.1525 CHANGES
--- rpm/CHANGES 26 Jul 2007 07:39:25 -0000 1.1524
+++ rpm/CHANGES 26 Jul 2007 08:10:30 -0000 1.1525
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rse: drop MARK64 hack as it isn't RPM's business to decide for lib64 -- for this there is Autoconf option --libdir
- rse: with --with-db-tools-integrated one can now build (and install) a db_tool which integrates all db_xxx BDB tools
- jbj: add RPMTAG_DBINSTANCE header extension.
- jbj: rip deep ia64 emulated triarch multilib hacks. worth millions to vendor, not me.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.67 -r2.68 Makefile.am
--- rpm/build/Makefile.am 23 Jul 2007 15:03:42 -0000 2.67
+++ rpm/build/Makefile.am 26 Jul 2007 08:10:31 -0000 2.68
@@ -23,7 +23,7 @@
pkginc_HEADERS = rpmbuild.h rpmspec.h
noinst_HEADERS = buildio.h
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmbuild.la
librpmbuild_la_SOURCES = \
build.c expression.c files.c misc.c names.c pack.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.223 -r2.224 configure.ac
--- rpm/configure.ac 26 Jul 2007 07:39:25 -0000 2.223
+++ rpm/configure.ac 26 Jul 2007 08:10:31 -0000 2.224
@@ -247,23 +247,6 @@
[ENABLE_BUILD_LAFILES],
[test ".$do_build_lafiles" = .yes])
-dnl # FIXME: Linux hack: choose /usr/lib or /usr/lib64 for library installs and linking
-MARK64=
-case "$target" in
- *-*-linux* )
- if ! echo "${libdir}" | grep -q '64$'; then
- case "${target_cpu}" in
- x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;;
- esac
- fi
- ;;
-esac
-AC_ARG_ENABLE(
- [build-lib64],
- AC_HELP_STRING([--disable-build-lib64], [disable automatic use of /usr/lib64 (system dependent)]),
- [ if test ".$enableval" = .no; then MARK64=""; fi ])
-AC_SUBST(MARK64)
-
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ -797,7 +780,7 @@
AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
[WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="\$(prefix)/include/python${WITH_PYTHON_VERSION}"])
AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
- [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="\${prefix}/lib${MARK64}/python${WITH_PYTHON_VERSION}"])
+ [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="\${prefix}/lib/python${WITH_PYTHON_VERSION}"])
AC_SUBST(WITH_PYTHON_INCDIR)
AC_SUBST(WITH_PYTHON_LIBDIR)
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.80 -r2.81 devtool.conf
--- rpm/devtool.conf 26 Jul 2007 07:41:40 -0000 2.80
+++ rpm/devtool.conf 26 Jul 2007 08:10:31 -0000 2.81
@@ -80,7 +80,6 @@
--with-selinux \
--with-python \
--without-perl \
- --enable-build-lib64 \
--enable-build-pic \
--enable-build-pie \
--enable-build-versionscript \
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.162 -r2.163 Makefile.am
--- rpm/lib/Makefile.am 23 Jul 2007 15:03:42 -0000 2.162
+++ rpm/lib/Makefile.am 26 Jul 2007 08:10:31 -0000 2.163
@@ -29,7 +29,7 @@
noinst_HEADERS = \
cpio.h fsm.h manifest.h psm.h rpmlead.h rpmlock.h signature.h tar.h
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpm.la
librpm_la_SOURCES = \
cpio.c depends.c formats.c fs.c fsm.c getdate.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.29 -r1.30 Makefile.am
--- rpm/misc/Makefile.am 24 Jul 2007 08:53:39 -0000 1.29
+++ rpm/misc/Makefile.am 26 Jul 2007 08:10:31 -0000 1.30
@@ -19,7 +19,7 @@
noinst_HEADERS = \
err.h error.h fnmatch.h glob.h
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmmisc.la
librpmmisc_la_SOURCES = librpmmisc.c
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpm/Makefile.am
============================================================================
$ cvs diff -u -r1.1 -r1.2 Makefile.am
--- rpm/python/rpm/Makefile.am 19 Oct 2004 21:33:22 -0000 1.1
+++ rpm/python/rpm/Makefile.am 26 Jul 2007 08:10:32 -0000 1.2
@@ -4,7 +4,7 @@
PYVER = @WITH_PYTHON_VERSION@
-pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@
+pylibdir = ${prefix}/lib/python@WITH_PYTHON_VERSION@
pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@
EXTRA_DIST = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/Makefile.am
============================================================================
$ cvs diff -u -r1.7 -r1.8 Makefile.am
--- rpm/rpmconstant/Makefile.am 23 Jul 2007 15:03:42 -0000 1.7
+++ rpm/rpmconstant/Makefile.am 26 Jul 2007 08:10:32 -0000 1.8
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2007/07/23 15:03:42 rse Exp $
+# $Id: Makefile.am,v 1.8 2007/07/26 08:10:32 rse Exp $
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -16,7 +16,7 @@
-I$(top_srcdir)/misc
bin_PROGRAMS = rpmconstant
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmconstant.la
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.75 -r1.76 Makefile.am
--- rpm/rpmdb/Makefile.am 26 Jul 2007 07:39:26 -0000 1.75
+++ rpm/rpmdb/Makefile.am 26 Jul 2007 08:10:32 -0000 1.76
@@ -36,7 +36,7 @@
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/misc/librpmmisc.la
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmdb.la
librpmdb_la_SOURCES = \
dbconfig.c fprint.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.100 -r1.101 Makefile.am
--- rpm/rpmio/Makefile.am 23 Jul 2007 15:03:43 -0000 1.100
+++ rpm/rpmio/Makefile.am 26 Jul 2007 08:10:32 -0000 1.101
@@ -40,7 +40,7 @@
salsa10.h salsa20.h tiger.h \
LzmaDecode.h rpmio_internal.h rpmlua.h rpmhook.h
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = \
argv.c digest.c fts.c getpass.c macro.c mire.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.43 -r1.44 Makefile.am
--- rpm/scripts/Makefile.am 16 Jul 2007 08:49:04 -0000 1.43
+++ rpm/scripts/Makefile.am 26 Jul 2007 08:10:33 -0000 1.44
@@ -49,7 +49,7 @@
symclash.py symclash.sh tgpg u_pkg.sh \
vpkg-provides.sh vpkg-provides2.sh
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = rpm.pc
install-exec-hook:
@@ .
Received on Thu Jul 26 10:10:33 2007