RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 10-Nov-2010 18:02:25
Branch: HEAD Handle: 2010111017022500
Modified files:
popt CHANGES Makefile.am configure.ac
Log:
add version-script linker capability also for openindiana native ld
Summary:
Revision Changes Path
1.150 +1 -0 popt/CHANGES
1.75 +1 -1 popt/Makefile.am
1.79 +52 -13 popt/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: popt/CHANGES
============================================================================
$ cvs diff -u -r1.149 -r1.150 CHANGES
--- popt/CHANGES 4 Nov 2010 15:30:21 -0000 1.149
+++ popt/CHANGES 10 Nov 2010 17:02:25 -0000 1.150
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+ - devzero2000: add version-script linker capability also for openindiana
native ld
- devzero2000: add test3 to the unit test, add color-tests automake
option
- devzero2000: add tdict to the unit test: augment make check with some
tdict tests
- devzero2000: add test2 to the unit test: augment make check with some
test2 tests
@@ .
patch -p0 <<'@@ .'
Index: popt/Makefile.am
============================================================================
$ cvs diff -u -r1.74 -r1.75 Makefile.am
--- popt/Makefile.am 4 Nov 2010 15:30:21 -0000 1.74
+++ popt/Makefile.am 10 Nov 2010 17:02:25 -0000 1.75
@@ -62,7 +62,7 @@
pkgconfig_DATA = popt.pc
if HAVE_LD_VERSION_SCRIPT
-libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers
+libpopt_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/libpopt.vers
endif
dist_man_MANS = popt.3
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
============================================================================
$ cvs diff -u -r1.78 -r1.79 configure.ac
--- popt/configure.ac 4 Nov 2010 15:30:21 -0000 1.78
+++ popt/configure.ac 10 Nov 2010 17:02:25 -0000 1.79
@@ -249,23 +249,62 @@
# drop AC_FUNC_MALLOC, REALLOC and STRTOD
AC_CHECK_FUNCS([malloc realloc strtod memset nl_langinfo stpcpy strchr
strerror strrchr])
-# Checks for ld_version scripts
-# For some systems we know that we have ld_version scripts.
-# Use it then as default.
-have_ld_version_script=no
-case "${host}" in
- *-*-linux*)
- have_ld_version_script=yes
- ;;
- *-*-gnu*)
- have_ld_version_script=yes
- ;;
-esac
AC_ARG_ENABLE([ld-version-script],
AS_HELP_STRING([--enable-ld-version-script],[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],
+ [
+ dnl check for version script support in the linker (GNU ld, or Solaris
ld style)
+ AC_CACHE_CHECK([for ld --version-script], [popt_cv_ld_version_script],
[dnl
+ cat > conftest.c <<EOF
+void cl_symbol1(void) {}
+void cli_symbol2(void) {}
+EOF
+ cat > conftest.map <<EOF
+RELEASE
+{
+ global:
+ cl_*;
+ local:
+ *;
+};
+PRIVATE
+{
+ global:
+ cli_*;
+ local:
+ *;
+};
+EOF
+ dnl check for GNU ld style linker version script
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
+ -o conftest.so conftest.c
+ -Wl,--version-script,conftest.map
+ 1>&AS_MESSAGE_LOG_FD]);
+ then
+ LD_VERSION_SCRIPT_FLAG=--version-script
+ popt_cv_ld_version_script=yes
+ else
+ dnl check for Solaris ld style linker version script
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
+ -o conftest.so conftest.c
+ -Wl,-M,conftest.map
+ 1>&AS_MESSAGE_LOG_FD]);
+ then
+ LD_VERSION_SCRIPT_FLAG=-M
+ popt_cv_ld_version_script=yes;
+ else
+ popt_cv_ld_version_script=no
+ fi
+ fi
+ have_ld_version_script=$popt_cv_ld_version_script
+ rm -f conftest*])
+ ])
+
+AC_SUBST([LD_VERSION_SCRIPT_FLAG])
AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],[test "$have_ld_version_script" =
"yes"])
# Autofu for pkgconfig
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
