Accepting request 63059 from home:jirislaby:branches:openSUSE:11.4:Update:Test

Accepted submit request 63059 from user jirislaby

OBS-URL: https://build.opensuse.org/request/show/63059
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libtool?expand=0&rev=25
This commit is contained in:
Sascha Peilicke 2011-03-01 08:29:43 +00:00 committed by Git OBS Bridge
parent 3e0e72111d
commit 643fd9ec7f
3 changed files with 72 additions and 0 deletions

View File

@ -0,0 +1,65 @@
From 2680f79c22e6bb1f8b9c7b5428da728b7e028b0c Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 28 Aug 2010 11:34:24 +0200
Subject: Fix AC_LANG_PROGRAM warnings from git Autoconf.
References: bnc#675573
* libltdl/m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Fix
underquoted AC_LANG_PROGRAM call.
(LT_PROG_AR): Use AC_LANG_PROGRAM.
(_LT_LINKER_SHLIBS) [irix, GCC]: Use the right source for the
given language.
* NEWS: Update.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
ChangeLog | 10 ++++++++++
libltdl/m4/libtool.m4 | 15 ++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-28 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ Fix AC_LANG_PROGRAM warnings from git Autoconf.
+ * libltdl/m4/libtool.m4 (_LT_SYS_MODULE_PATH_AIX): Fix
+ underquoted AC_LANG_PROGRAM call.
+ (_LT_LINKER_SHLIBS) [irix, GCC]: Use the right source for the
+ given language.
+
2009-11-16 Peter O'Gorman <peter@pogma.com>
Really update libltdl version-info.
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1021,7 +1021,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# to the aix ld manual.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+AC_LINK_IFELSE([AC_LANG_PROGRAM],[
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
/^0/ {
@@ -4826,9 +4826,18 @@ _LT_EOF
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(
+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+ [C++], [[int foo (void) { return 0; }]],
+ [Fortran 77], [[
+ subroutine foo
+ end]],
+ [Fortran], [[
+ subroutine foo
+ end]])])], [
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
+ ])
LDFLAGS="$save_LDFLAGS"
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 28 22:00:49 CET 2011 - jslaby@suse.de
- Fix AC_LANG_PROGRAM warnings (bnc#675573)
-------------------------------------------------------------------
Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de

View File

@ -36,6 +36,7 @@ Requires: libltdl7 = %{version}
Url: http://www.gnu.org/software/libtool/
Source: ftp://ftp.gnu.org/pub/gnu/libtool/libtool-%{version}.tar.lzma
Source2: baselibs.conf
Patch0: fix-AC_LANG_PROGRAM-warnings.patch
Patch1: libtool-no-hostname.patch
#Patch: libtool-%{version}.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -55,6 +56,7 @@ Library needed by programs that use the ltdl interface of GNU libtool.
%prep
%setup -q -n libtool-%{version}
%patch0 -p1
%patch1 -p0
#%patch -p1