RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 20-Jun-2011 14:33:31
Branch: rpm-5_4 Handle: 2011062012332505
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/rpmconstant Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
Log:
merge the popt autofu vendor-script linker script check for openindiana
native
ld, using modern and not deprecated autoconf construct. Even if the check
is not perfect
but it is based on a resultant ld warning, on openindiana the result should
work
with gcc and native ld also for rpm.
Summary:
Revision Changes Path
1.3501.2.140+4 -0 rpm/CHANGES
2.80.2.1 +1 -1 rpm/build/Makefile.am
2.472.2.24 +56 -13 rpm/configure.ac
2.203.2.2 +1 -1 rpm/lib/Makefile.am
1.56.2.2 +1 -1 rpm/misc/Makefile.am
1.13.2.3 +2 -2 rpm/rpmconstant/Makefile.am
1.134.2.2 +1 -1 rpm/rpmdb/Makefile.am
1.293.2.3 +1 -1 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.139 -r1.3501.2.140 CHANGES
--- rpm/CHANGES 16 Jun 2011 08:30:53 -0000 1.3501.2.139
+++ rpm/CHANGES 20 Jun 2011 12:33:25 -0000 1.3501.2.140
@@ -9,6 +9,10 @@
- mdawkins: tagged 5.4.2 release in configure.ac
5.4.0 -> 5.4.1:
+ - devzero2000: merge the popt autofu vendor-script linker script check
for openindiana native
+ ld, using modern and not deprecated autoconf construct. Even if the
check is not perfect
+ but it is based on a resultant ld warning, on openindiana the result
should work
+ with gcc and native ld also for rpm.
- devzero2000: In fpLookupSubdir, data returned by hash should be of type
"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
segfault. Patch by Qing He.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.80 -r2.80.2.1 Makefile.am
--- rpm/build/Makefile.am 2 Nov 2010 16:55:54 -0000 2.80
+++ rpm/build/Makefile.am 20 Jun 2011 12:33:29 -0000 2.80.2.1
@@ -41,7 +41,7 @@
parseSpec.c poptBT.c reqprov.c spec.c
librpmbuild_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmbuild_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmbuild.vers
+librpmbuild_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmbuild.vers
endif
librpmbuild_la_LIBADD =
if ENABLE_BUILD_INTLIBDEP
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.23 -r2.472.2.24 configure.ac
--- rpm/configure.ac 7 Jun 2011 15:37:38 -0000 2.472.2.23
+++ rpm/configure.ac 20 Jun 2011 12:33:27 -0000 2.472.2.24
@@ -297,19 +297,62 @@
])
AC_SUBST(LDFLAGS_STATIC)
-dnl # use ld_version scripts on platforms known to support it.
-have_ld_version_script=no
-case "${host}" in
- *-*-linux* ) have_ld_version_script=yes ;;
- *-*-gnu* ) have_ld_version_script=yes ;;
-esac
-AC_ARG_ENABLE(
- [build-versionscript],
- AS_HELP_STRING([--enable-build-versionscript],[enable/disable use of GNU
ld(1) version script (default is system dependent)]),
- [have_ld_version_script=$enableval], [:])
-AM_CONDITIONAL(
- [HAVE_LD_VERSION_SCRIPT],
- [test ".$have_ld_version_script" = .yes])
+dnl check for version script support in the linker (GNU ld, or Solaris ld
style)
+AC_ARG_ENABLE([build-versionscript],
+ AS_HELP_STRING([--enable-build-versionscript],[enable/disable
use of linker version script.
+ (default is system dependent)]),
+ [have_ld_version_script=$enableval],
+ [have_ld_version_script=yes] )
+
+AS_IF([test "x$have_ld_version_script" = xyes],
+ [
+ AC_MSG_CHECKING([if ld version-script works - GNU ld, Solaris ld])
+ cat > conftest.map <<EOF
+RELEASE
+{
+ global:
+ rpm_*;
+ local:
+ *;
+};
+PRIVATE
+{
+ global:
+ rpmi_*;
+ local:
+ *;
+};
+EOF
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ void rpm_symbol1(void) {}
+ void rpmi_symbol2(void) {}
+ ]], [])],
+ [have_ld_version_script=yes], [have_ld_version_script=no])
+ LDFLAGS="$save_LDFLAGS"
+ if test x$have_ld_version_script != xyes
+ then
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -Wl,-M,conftest.map"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ void rpm_symbol1(void) {}
+ void rpmi_symbol2(void) {}
+ ]], [])],
+ [have_ld_version_script=yes], [have_ld_version_script=no])
+ LDFLAGS="$save_LDFLAGS"
+ if test x$have_ld_version_script = xyes
+ then
+ LD_VERSION_SCRIPT_FLAG=-M
+ fi
+ else
+ LD_VERSION_SCRIPT_FLAG=--version-script
+ fi
+ AC_MSG_RESULT($have_ld_version_script)
+ rm -f conftest.map conftest.c
+])
+AC_SUBST([LD_VERSION_SCRIPT_FLAG])
+AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],[test "$have_ld_version_script" =
"yes"])
dnl # support implicit internal library dependencies
AC_ARG_ENABLE(
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.203.2.1 -r2.203.2.2 Makefile.am
--- rpm/lib/Makefile.am 9 Dec 2010 20:44:14 -0000 2.203.2.1
+++ rpm/lib/Makefile.am 20 Jun 2011 12:33:29 -0000 2.203.2.2
@@ -71,7 +71,7 @@
transaction.c verify.c rpmluaext.c
librpm_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpm_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpm.vers
+librpm_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpm.vers
endif
librpm_la_LIBADD =
if ENABLE_BUILD_INTLIBDEP
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.56.2.1 -r1.56.2.2 Makefile.am
--- rpm/misc/Makefile.am 3 Apr 2011 19:15:55 -0000 1.56.2.1
+++ rpm/misc/Makefile.am 20 Jun 2011 12:33:29 -0000 1.56.2.2
@@ -28,7 +28,7 @@
librpmmisc_la_SOURCES = librpmmisc.c
librpmmisc_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmmisc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmmisc.vers
+librpmmisc_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmmisc.vers
endif
librpmmisc_la_LDFLAGS += \
@WITH_DB_LDFLAGS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/Makefile.am
============================================================================
$ cvs diff -u -r1.13.2.2 -r1.13.2.3 Makefile.am
--- rpm/rpmconstant/Makefile.am 9 May 2011 04:06:33 -0000 1.13.2.2
+++ rpm/rpmconstant/Makefile.am 20 Jun 2011 12:33:30 -0000 1.13.2.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.13.2.2 2011/05/09 04:06:33 jbj Exp $
+# $Id: Makefile.am,v 1.13.2.3 2011/06/20 12:33:30 devzero2000 Exp $
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -33,7 +33,7 @@
rpmconstant_internal.c
librpmconstant_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmconstant_la_LDFLAGS +=
-Wl,--version-script=$(srcdir)/librpmconstant.vers
+librpmconstant_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmconstant.vers
endif
librpmconstant_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.134.2.1 -r1.134.2.2 Makefile.am
--- rpm/rpmdb/Makefile.am 2 Jun 2011 19:28:09 -0000 1.134.2.1
+++ rpm/rpmdb/Makefile.am 20 Jun 2011 12:33:30 -0000 1.134.2.2
@@ -80,7 +80,7 @@
$(logio_LSOURCES)
librpmdb_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers
+librpmdb_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmdb.vers
endif
librpmdb_la_LIBADD = $(DBLIBOBJS)
if ENABLE_BUILD_INTLIBDEP
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.293.2.2 -r1.293.2.3 Makefile.am
--- rpm/rpmio/Makefile.am 15 Dec 2010 02:34:27 -0000 1.293.2.2
+++ rpm/rpmio/Makefile.am 20 Jun 2011 12:33:30 -0000 1.293.2.3
@@ -110,7 +110,7 @@
strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmio_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmio.vers
+librpmio_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmio.vers
endif
librpmio_la_LIBADD = -lm
if ENABLE_BUILD_INTLIBDEP
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
