RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 20:12:32
Branch: HEAD Handle: 2007062419123002
Modified files:
rpm Makefile.am configure.ac
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/perl Makefile.PL.in
rpm/python Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
rpm/tools Makefile.am
Log:
remove an old INCPATH hack I see no more reason for. Use standard
CPPFLAGS extension instead. Also still keep but shrink the nasty
platform-specific 'addlib' hacks
Summary:
Revision Changes Path
2.173 +1 -2 rpm/Makefile.am
2.57 +1 -2 rpm/build/Makefile.am
2.111 +28 -64 rpm/configure.ac
2.152 +1 -2 rpm/lib/Makefile.am
1.20 +1 -1 rpm/misc/Makefile.am
1.2 +1 -1 rpm/perl/Makefile.PL.in
1.69 +1 -2 rpm/python/Makefile.am
1.58 +1 -2 rpm/rpmdb/Makefile.am
1.84 +1 -2 rpm/rpmio/Makefile.am
2.88 +1 -2 rpm/tools/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.172 -r2.173 Makefile.am
--- rpm/Makefile.am 20 Jun 2007 21:42:24 -0000 2.172
+++ rpm/Makefile.am 24 Jun 2007 18:12:30 -0000 2.173
@@ -44,8 +44,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
- @WITH_LIBELF_INCLUDE@ \
- @INCPATH@
+ @WITH_LIBELF_INCLUDE@
staticLDFLAGS = # @LDFLAGS_STATIC@ # @LDFLAGS_NPTL@
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.56 -r2.57 Makefile.am
--- rpm/build/Makefile.am 21 Jun 2007 18:19:00 -0000 2.56
+++ rpm/build/Makefile.am 24 Jun 2007 18:12:30 -0000 2.57
@@ -12,8 +12,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
@WITH_LIBELF_INCLUDE@ \
- -I$(top_srcdir)/misc \
- @INCPATH@
+ -I$(top_srcdir)/misc
LIBS =
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.110 -r2.111 configure.ac
--- rpm/configure.ac 24 Jun 2007 10:27:20 -0000 2.110
+++ rpm/configure.ac 24 Jun 2007 18:12:30 -0000 2.111
@@ -155,14 +155,40 @@
LDFLAGS_NPTL=
if test -f /usr/lib/nptl/libpthread.a ; then
LDFLAGS_NPTL="-L/usr/lib/nptl"
-# INCPATH="$INCPATH -I/usr/include/nptl"
fi
if test -f /usr/lib64/nptl/libpthread.a ; then
LDFLAGS_NPTL="-L/usr/lib64/nptl"
-# INCPATH="$INCPATH -I/usr/include/nptl"
fi
AC_SUBST(LDFLAGS_NPTL)
+dnl # old RPM 4.x style platform-specific flag extension hack
+addlib () {
+ l=$1
+ shift
+ case "$target" in
+ *-*-solaris2.[234567]) LIBS="$LIBS -L$l -R$l $*" ;;
+ * ) LIBS="$LIBS -L$l $*";;
+ esac
+}
+if test "$cross_compiling" != "yes" && \
+ test ".$prefix" != .NONE && \
+ test ".$prefix" != "./usr"; then
+ if test -d $dir/lib; then
+ addlib $dir/lib
+ fi
+ if test -d $dir/include; then
+ CPPFLAGS="$CPPFLAGS -I$prefix/include"
+ fi
+fi
+if test -d /usr/ucblib; then
+ case $build in
+ mips-sni-sysv4 )
+ addlib /usr/ccs/lib -lc
+ addlib /usr/ucblib
+ ;;
+ esac
+fi
+
dnl
dnl look for POSIX chmod attributes
dnl
@@ -308,15 +334,6 @@
AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
-addlib() {
- l=$1
- shift
- case "$target" in
- *-*-solaris2.[234567]) LIBS="$LIBS -L$l -R$l $*";;
- *) LIBS="$LIBS -L$l $*";;
- esac
-}
-
#=================
RPM_CHECK_LIB([ZLib], [zlib],
@@ -335,58 +352,6 @@
#=================
-localdone=
-
-dirs=$prefix
-if test "$cross_compiling" != "yes"; then
- dirs="$dirs"
-for dir in $dirs
-do
- case $dir in
- NONE|/usr) continue;;
- /usr/local)
- if test X$localdone != X ; then continue; fi
- localdone="$dir"
- ;;
- esac
-
- AC_MSG_CHECKING(for $dir/lib in LIBS)
- if test -d $dir/lib 2> /dev/null ; then
- addlib $dir/lib
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-
- AC_MSG_CHECKING(for $dir/include in INCPATH)
- if test -d $dir/include 2>/dev/null ; then
- if [[ "$dir" != "/usr/local" ]] ; then
- INCPATH="$INCPATH -I$dir/include"
- fi
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-done
-fi
-
-AC_MSG_CHECKING(for /usr/ucblib in LIBS)
-if test -d /usr/ucblib ; then
- case $build in
- mips-sni-sysv4)
- addlib /usr/ccs/lib -lc
- addlib /usr/ucblib
- AC_MSG_RESULT(yes)
- ;;
- *-*-solaris2.*)
- AC_MSG_RESULT(yes)
- ;;
- *)
- AC_MSG_RESULT(no)
- ;;
- esac
-fi
-
dnl
dnl Check for features
dnl
@@ -1303,7 +1268,6 @@
testdir="`pwd`/tests"
AC_SUBST(testdir)
-AC_SUBST(INCPATH)
AC_SUBST(RPM)
dnl ##
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.151 -r2.152 Makefile.am
--- rpm/lib/Makefile.am 20 Jun 2007 21:10:21 -0000 2.151
+++ rpm/lib/Makefile.am 24 Jun 2007 18:12:30 -0000 2.152
@@ -9,8 +9,7 @@
-I$(top_srcdir)/build \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
- -I$(top_srcdir)/misc \
- @INCPATH@
+ -I$(top_srcdir)/misc
EXTRA_DIST = getdate.y librpm.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.19 -r1.20 Makefile.am
--- rpm/misc/Makefile.am 23 Jan 2005 20:45:36 -0000 1.19
+++ rpm/misc/Makefile.am 24 Jun 2007 18:12:31 -0000 1.20
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I. -I$(top_srcdir) @INCPATH@
+INCLUDES = -I. -I$(top_srcdir)
EXTRA_DIST = \
alloca.c basename.c err.c error.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/perl/Makefile.PL.in
============================================================================
$ cvs diff -u -r1.1 -r1.2 Makefile.PL.in
--- rpm/perl/Makefile.PL.in 10 Feb 2000 22:13:48 -0000 1.1
+++ rpm/perl/Makefile.PL.in 24 Jun 2007 18:12:31 -0000 1.2
@@ -11,7 +11,7 @@
'CCFLAGS' => '@CFLAGS@',
'OPTIMIZE'=> '-g',
'DEFINE' => '-Dbool=char -DHAS_BOOL',
- 'INC' => '@INCPATH@ -I../build -I../lib -I../popt
-I/usr/include/rpm',
+ 'INC' => '-I../build -I../lib -I../popt -I/usr/include/rpm',
'depend' => { 'rpm.c' => 'transaction.xs header.xs db.xs' },
);
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.68 -r1.69 Makefile.am
--- rpm/python/Makefile.am 22 Jun 2007 20:11:03 -0000 1.68
+++ rpm/python/Makefile.am 24 Jun 2007 18:12:31 -0000 1.69
@@ -19,8 +19,7 @@
-I$(top_srcdir)/rpmio \
@WITH_LIBELF_INCLUDE@ \
-I$(top_srcdir)/misc \
- -I$(pyincdir) \
- @INCPATH@
+ -I$(pyincdir)
noinst_HEADERS = header-py.h \
rpmal-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.57 -r1.58 Makefile.am
--- rpm/rpmdb/Makefile.am 20 Jun 2007 21:10:21 -0000 1.57
+++ rpm/rpmdb/Makefile.am 24 Jun 2007 18:12:31 -0000 1.58
@@ -10,8 +10,7 @@
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
- @WITH_LIBELF_INCLUDE@ \
- @INCPATH@
+ @WITH_LIBELF_INCLUDE@
EXTRA_DIST = db3.c sqlite.c db_emu.h librpmdb.vers
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.83 -r1.84 Makefile.am
--- rpm/rpmio/Makefile.am 22 Jun 2007 12:58:11 -0000 1.83
+++ rpm/rpmio/Makefile.am 24 Jun 2007 18:12:32 -0000 1.84
@@ -10,8 +10,7 @@
INCLUDES = -I. \
-I$(top_srcdir) \
- -I$(top_srcdir)/misc \
- @INCPATH@
+ -I$(top_srcdir)/misc
pkgincdir = $(pkgincludedir)
pkginc_HEADERS = \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.87 -r2.88 Makefile.am
--- rpm/tools/Makefile.am 20 Jun 2007 21:10:22 -0000 2.87
+++ rpm/tools/Makefile.am 24 Jun 2007 18:12:32 -0000 2.88
@@ -8,8 +8,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
@WITH_LIBELF_INCLUDE@ \
- -I$(top_srcdir)/misc \
- @INCPATH@
+ -I$(top_srcdir)/misc
EXTRA_DIST = hashtab.h
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
