[meego-commits] 15457: Changes to Trunk:Testing/libtool

[junfeng]

Hi,
I have made the following changes to libtool in project Trunk:Testing. Please review and accept ASAP.

Thank You,
junfeng

[This message was auto-generated]

---

Request #15457:

  submit:   home:junfeng:branches:Trunk:Testing/libtool(r3)(noupdate) -> Trunk:Testing/libtool


Message:
    Fix for BMC14847.

State:   new          2011-03-29T22:58:08 junfeng
Comment: None



changes files:
--------------
--- libtool.changes
+++ libtool.changes
@@ -0,0 +1,3 @@
+* Thu Mar 30 2011 Junfeng Dong <junfeng.dong at intel.com> -2.2.6b
+- Fix BMC14847: lots of warning on AC_LANG_CONFTEST.
+

new:
----
  fix-AC_LANG_PROGRAM.patch

spec files:
-----------
--- libtool.spec
+++ libtool.spec
@@ -7,6 +7,7 @@
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz
 Patch0: no-host-name.patch
+Patch1: fix-AC_LANG_PROGRAM.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 Requires(post):  /sbin/install-info
@@ -67,6 +68,7 @@
 %prep
 %setup -n libtool-%{version} -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 

other changes:
--------------

++++++ fix-AC_LANG_PROGRAM.patch (new)
--- fix-AC_LANG_PROGRAM.patch
+++ fix-AC_LANG_PROGRAM.patch
+commit ddcb581a62c8584d51d8af9d8d80c0d9ce5e7127
+Author: Junfeng <junfeng.dong at intel.com>
+Date:   Wed Mar 30 10:46:03 2011 +0800
+
+    back port commit for AC_LANG_SOURCE warning.
+
+diff --git a/ChangeLog b/ChangeLog
+index 24bba01..68297be 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,16 @@
++2011--03-30 Backport the following commit
++	commit 2680f79c22e6bb1f8b9c7b5428da728b7e028b0c
++	2010-08-28  Ralf Wildenhues  <Ralf.Wildenhues at 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_PROG_AR): Use AC_LANG_PROGRAM.
++	(_LT_LINKER_SHLIBS) [irix, GCC]: Use the right source for the
++	given language.
++	* NEWS: Update.
++
++
+ 2009-11-16  Peter O'Gorman  <peter at pogma.com>
+ 
+ 	Really update libltdl version-info.
+diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
+index 39ba996..c2d5c7d 100644
+--- 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'