23210155 Upgrade libtool to 2.4.6
authorBinjih Lin <binjih.lin@oracle.com>
Tue, 10 Jan 2017 13:28:05 -0800
changeset 7553 9bd80d515ff3
parent 7552 17fdfad41903
child 7554 a0afd8f2e974
23210155 Upgrade libtool to 2.4.6
components/libtool/Makefile
components/libtool/libltdl.p5m
components/libtool/libtool.p5m
components/libtool/test/results-32.master
components/libtool/test/results-64.master
--- a/components/libtool/Makefile	Tue Jan 10 17:35:21 2017 -0800
+++ b/components/libtool/Makefile	Tue Jan 10 13:28:05 2017 -0800
@@ -20,19 +20,19 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # libtool only delivers scripts that embed paths, so prefer 32-bit.
 BUILD_BITS= 32_and_64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libtool
-COMPONENT_VERSION=	2.4.2
+COMPONENT_VERSION=	2.4.6
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
+    sha256:e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
 COMPONENT_BUGDB=	utility/libtool
 
-TPNO=			9088
+TPNO=			24542
 
 BUILD_TARGET=
 INSTALL_TARGET=
@@ -42,8 +42,9 @@
 CONFIGURE_OPTIONS  +=		--disable-static
 CONFIGURE_OPTIONS  +=		PERL="$(PERL)"
 
-COMPONENT_PREP_ACTION = (cd $(@D) ; ./bootstrap)
-
+COMPONENT_PREP_ACTION = (cd $(@D) ; \
+	touch $(SOURCE_DIR)/README-release ; \
+	MAKE=/usr/bin/gmake ./bootstrap --force --no-git)
 # Remove the hard-wired compiler locations in the LTCC and CC line
 # in the version of the libtool script.
 COMPONENT_POST_INSTALL_ACTION = \
@@ -52,6 +53,8 @@
 		-e 's|^LTCC="/.*$$|LTCC="cc"|' \
 		-e 's|^CC="/.*$$|CC="cc"|' libtool ; \
 
+# When this component is updated, a full Userland build should
+# be performed in a test BE with the new version of libtool installed
 COMPONENT_TEST_TRANSFORMS += \
 	'-n ' \
 	'-e "/SKIP/p" ' \
--- a/components/libtool/libltdl.p5m	Tue Jan 10 17:35:21 2017 -0800
+++ b/components/libtool/libltdl.p5m	Tue Jan 10 13:28:05 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -31,10 +31,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.7.3.0
-link path=usr/lib/$(MACH64)/libltdl.so.7 target=libltdl.so.7.3.0
-file path=usr/lib/$(MACH64)/libltdl.so.7.3.0
-link path=usr/lib/libltdl.so target=libltdl.so.7.3.0
-link path=usr/lib/libltdl.so.7 target=libltdl.so.7.3.0
-file path=usr/lib/libltdl.so.7.3.0
-license libtool.license license=GPLv2
+link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.7.3.1
+link path=usr/lib/$(MACH64)/libltdl.so.7 target=libltdl.so.7.3.1
+file path=usr/lib/$(MACH64)/libltdl.so.7.3.1
+link path=usr/lib/libltdl.so target=libltdl.so.7.3.1
+link path=usr/lib/libltdl.so.7 target=libltdl.so.7.3.1
+file path=usr/lib/libltdl.so.7.3.1
+license libtool.license license="FDLv1.3, GPLv2, LGPLv2.1"
--- a/components/libtool/libtool.p5m	Tue Jan 10 17:35:21 2017 -0800
+++ b/components/libtool/libtool.p5m	Tue Jan 10 13:28:05 2017 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/share/man/.+$ -> set mangler.man.stability 'uncommitted (obsolete)' >
@@ -42,8 +42,8 @@
 file path=usr/include/libltdl/lt_error.h
 file path=usr/include/libltdl/lt_system.h
 file path=usr/include/ltdl.h
-file path=usr/share/aclocal/argz.m4
 file path=usr/share/aclocal/libtool.m4
+file path=usr/share/aclocal/ltargz.m4
 file path=usr/share/aclocal/ltdl.m4
 file path=usr/share/aclocal/ltoptions.m4
 file path=usr/share/aclocal/ltsugar.m4
@@ -52,51 +52,51 @@
 file path=usr/share/info/libtool.info
 file path=usr/share/info/libtool.info-1
 file path=usr/share/info/libtool.info-2
-file path=usr/share/libtool/config/compile
-file path=usr/share/libtool/config/config.guess
-file path=usr/share/libtool/config/config.sub
-file path=usr/share/libtool/config/depcomp
-file path=usr/share/libtool/config/install-sh
-file path=usr/share/libtool/config/ltmain.sh
-file path=usr/share/libtool/config/missing
-file path=usr/share/libtool/libltdl/COPYING.LIB
-file path=usr/share/libtool/libltdl/Makefile.am
-file path=usr/share/libtool/libltdl/Makefile.in
-file path=usr/share/libtool/libltdl/Makefile.inc
-file path=usr/share/libtool/libltdl/README
-file path=usr/share/libtool/libltdl/aclocal.m4
-file path=usr/share/libtool/libltdl/argz.c
-file path=usr/share/libtool/libltdl/argz_.h
-file path=usr/share/libtool/libltdl/config-h.in
-file path=usr/share/libtool/libltdl/configure
-file path=usr/share/libtool/libltdl/configure.ac
-file path=usr/share/libtool/libltdl/libltdl/lt__alloc.h
-file path=usr/share/libtool/libltdl/libltdl/lt__dirent.h
-file path=usr/share/libtool/libltdl/libltdl/lt__glibc.h
-file path=usr/share/libtool/libltdl/libltdl/lt__private.h
-file path=usr/share/libtool/libltdl/libltdl/lt__strl.h
-file path=usr/share/libtool/libltdl/libltdl/lt_dlloader.h
-file path=usr/share/libtool/libltdl/libltdl/lt_error.h
-file path=usr/share/libtool/libltdl/libltdl/lt_system.h
-file path=usr/share/libtool/libltdl/libltdl/slist.h
-file path=usr/share/libtool/libltdl/loaders/dld_link.c
-file path=usr/share/libtool/libltdl/loaders/dlopen.c
-file path=usr/share/libtool/libltdl/loaders/dyld.c
-file path=usr/share/libtool/libltdl/loaders/load_add_on.c
-file path=usr/share/libtool/libltdl/loaders/loadlibrary.c
-file path=usr/share/libtool/libltdl/loaders/preopen.c
-file path=usr/share/libtool/libltdl/loaders/shl_load.c
-file path=usr/share/libtool/libltdl/lt__alloc.c
-file path=usr/share/libtool/libltdl/lt__dirent.c
-file path=usr/share/libtool/libltdl/lt__strl.c
-file path=usr/share/libtool/libltdl/lt_dlloader.c
-file path=usr/share/libtool/libltdl/lt_error.c
-file path=usr/share/libtool/libltdl/ltdl.c
-file path=usr/share/libtool/libltdl/ltdl.h
-file path=usr/share/libtool/libltdl/slist.c
+file path=usr/share/libtool/COPYING.LIB
+file path=usr/share/libtool/Makefile.am
+file path=usr/share/libtool/Makefile.in
+file path=usr/share/libtool/README
+file path=usr/share/libtool/aclocal.m4
+file path=usr/share/libtool/build-aux/compile
+file path=usr/share/libtool/build-aux/config.guess
+file path=usr/share/libtool/build-aux/config.sub
+file path=usr/share/libtool/build-aux/depcomp
+file path=usr/share/libtool/build-aux/install-sh
+file path=usr/share/libtool/build-aux/ltmain.sh
+file path=usr/share/libtool/build-aux/missing
+file path=usr/share/libtool/config-h.in
+file path=usr/share/libtool/configure
+file path=usr/share/libtool/configure.ac
+file path=usr/share/libtool/libltdl/lt__alloc.h
+file path=usr/share/libtool/libltdl/lt__argz_.h
+file path=usr/share/libtool/libltdl/lt__dirent.h
+file path=usr/share/libtool/libltdl/lt__glibc.h
+file path=usr/share/libtool/libltdl/lt__private.h
+file path=usr/share/libtool/libltdl/lt__strl.h
+file path=usr/share/libtool/libltdl/lt_dlloader.h
+file path=usr/share/libtool/libltdl/lt_error.h
+file path=usr/share/libtool/libltdl/lt_system.h
+file path=usr/share/libtool/libltdl/slist.h
+file path=usr/share/libtool/loaders/dld_link.c
+file path=usr/share/libtool/loaders/dlopen.c
+file path=usr/share/libtool/loaders/dyld.c
+file path=usr/share/libtool/loaders/load_add_on.c
+file path=usr/share/libtool/loaders/loadlibrary.c
+file path=usr/share/libtool/loaders/preopen.c
+file path=usr/share/libtool/loaders/shl_load.c
+file path=usr/share/libtool/lt__alloc.c
+file path=usr/share/libtool/lt__argz.c
+file path=usr/share/libtool/lt__dirent.c
+file path=usr/share/libtool/lt__strl.c
+file path=usr/share/libtool/lt_dlloader.c
+file path=usr/share/libtool/lt_error.c
+file path=usr/share/libtool/ltdl.c
+file path=usr/share/libtool/ltdl.h
+file path=usr/share/libtool/ltdl.mk
+file path=usr/share/libtool/slist.c
 file path=usr/share/man/man1/libtool.1
 file path=usr/share/man/man1/libtoolize.1
-license libtool.license license="GPLv2, FDLv1.3"
+license libtool.license license="FDLv1.3, GPLv2, LGPLv2.1"
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ggrep
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/gsed
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ld
--- a/components/libtool/test/results-32.master	Tue Jan 10 17:35:21 2017 -0800
+++ b/components/libtool/test/results-32.master	Tue Jan 10 13:28:05 2017 -0800
@@ -1,127 +1,11 @@
-PASS: tests/link.test
-PASS: tests/link-2.test
-PASS: tests/nomode.test
-PASS: tests/objectlist.test
-PASS: tests/quote.test
-PASS: tests/sh.test
-PASS: tests/suffix.test
-PASS: tests/tagtrace.test
-PASS: tests/cdemo-static.test
-PASS: tests/cdemo-static-make.test
-PASS: tests/cdemo-static-exec.test
-PASS: tests/demo-static.test
-PASS: tests/demo-static-make.test
-PASS: tests/demo-static-exec.test
-PASS: tests/demo-static-inst.test
-PASS: tests/demo-static-unst.test
-PASS: tests/depdemo-static.test
-PASS: tests/depdemo-static-make.test
-PASS: tests/depdemo-static-exec.test
-PASS: tests/depdemo-static-inst.test
-PASS: tests/depdemo-static-unst.test
-PASS: tests/mdemo-static.test
-PASS: tests/mdemo-static-make.test
-PASS: tests/mdemo-static-exec.test
-PASS: tests/mdemo-static-inst.test
-PASS: tests/mdemo-static-unst.test
-PASS: tests/cdemo-conf.test
-PASS: tests/cdemo-make.test
-PASS: tests/cdemo-exec.test
-PASS: tests/demo-conf.test
-PASS: tests/demo-make.test
-PASS: tests/demo-exec.test
-PASS: tests/demo-inst.test
-PASS: tests/demo-unst.test
-PASS: tests/demo-deplibs.test
-PASS: tests/depdemo-conf.test
-PASS: tests/depdemo-make.test
-PASS: tests/depdemo-exec.test
-PASS: tests/depdemo-inst.test
-PASS: tests/depdemo-unst.test
-PASS: tests/mdemo-conf.test
-PASS: tests/mdemo-make.test
-PASS: tests/mdemo-exec.test
-PASS: tests/mdemo-inst.test
-PASS: tests/mdemo-unst.test
-PASS: tests/mdemo-dryrun.test
-PASS: tests/mdemo2-conf.test
-PASS: tests/mdemo2-make.test
-PASS: tests/mdemo2-exec.test
-PASS: tests/pdemo-conf.test
-PASS: tests/pdemo-make.test
-PASS: tests/pdemo-exec.test
-PASS: tests/pdemo-inst.test
-PASS: tests/demo-nofast.test
-PASS: tests/demo-nofast-make.test
-PASS: tests/demo-nofast-exec.test
-PASS: tests/demo-nofast-inst.test
-PASS: tests/demo-nofast-unst.test
-PASS: tests/depdemo-nofast.test
-PASS: tests/depdemo-nofast-make.test
-PASS: tests/depdemo-nofast-exec.test
-PASS: tests/depdemo-nofast-inst.test
-PASS: tests/depdemo-nofast-unst.test
-PASS: tests/demo-pic.test
-PASS: tests/demo-pic-make.test
-PASS: tests/demo-pic-exec.test
-SKIP: tests/demo-nopic.test
-PASS: tests/demo-nopic-make.test
-PASS: tests/demo-nopic-exec.test
-PASS: tests/cdemo-shared.test
-PASS: tests/cdemo-shared-make.test
-PASS: tests/cdemo-shared-exec.test
-PASS: tests/mdemo-shared.test
-PASS: tests/mdemo-shared-make.test
-PASS: tests/mdemo-shared-exec.test
-PASS: tests/mdemo-shared-inst.test
-PASS: tests/mdemo-shared-unst.test
-PASS: tests/cdemo-undef.test
-PASS: tests/cdemo-undef-make.test
-PASS: tests/cdemo-undef-exec.test
-PASS: tests/tagdemo-static.test
-PASS: tests/tagdemo-static-make.test
-PASS: tests/tagdemo-static-exec.test
-PASS: tests/tagdemo-conf.test
-PASS: tests/tagdemo-make.test
-PASS: tests/tagdemo-exec.test
-PASS: tests/tagdemo-shared.test
-PASS: tests/tagdemo-shared-make.test
-PASS: tests/tagdemo-shared-exec.test
-PASS: tests/tagdemo-undef.test
-PASS: tests/tagdemo-undef-make.test
-PASS: tests/tagdemo-undef-exec.test
-PASS: tests/fcdemo-static.test
-PASS: tests/fcdemo-static-make.test
-PASS: tests/fcdemo-static-exec.test
-PASS: tests/fcdemo-conf.test
-PASS: tests/fcdemo-make.test
-PASS: tests/fcdemo-exec.test
-PASS: tests/fcdemo-shared.test
-PASS: tests/fcdemo-shared-make.test
-PASS: tests/fcdemo-shared-exec.test
-PASS: tests/demo-shared.test
-PASS: tests/demo-shared-make.test
-PASS: tests/demo-shared-exec.test
-PASS: tests/demo-shared-inst.test
-FAIL: tests/demo-hardcode.test
-PASS: tests/demo-relink.test
-PASS: tests/demo-noinst-link.test
-PASS: tests/demo-shared-unst.test
-PASS: tests/depdemo-shared.test
-PASS: tests/depdemo-shared-make.test
-PASS: tests/depdemo-shared-exec.test
-PASS: tests/depdemo-shared-inst.test
-PASS: tests/depdemo-relink.test
-PASS: tests/depdemo-shared-unst.test
-PASS: tests/f77demo-static.test
-PASS: tests/f77demo-static-make.test
-PASS: tests/f77demo-static-exec.test
-PASS: tests/f77demo-conf.test
-PASS: tests/f77demo-make.test
-PASS: tests/f77demo-exec.test
-PASS: tests/f77demo-shared.test
-PASS: tests/f77demo-shared-make.test
-PASS: tests/f77demo-shared-exec.test
-====================================
-1 of 123 tests failed
-====================================
+ 70: Runpath in libtool library files                FAILED (runpath-in-lalib.at:61)
+117: enforced lib prefix                             FAILED (need_lib_prefix.at:182)
+138: shared library                                  FAILED (tagdemo.at:359)
+139: shared and static together                      FAILED (tagdemo.at:374)
+144: C++ exception handling                          FAILED (exceptions.at:373)
+156: static library                                  FAILED (fcdemo.at:319)
+157: shared library                                  FAILED (fcdemo.at:334)
+158: shared and static together                      FAILED (fcdemo.at:349)
+170: Run tests with low max_cmd_len                  FAILED (cmdline_wrap.at:47)
+14 failed (5 expected failures).
+   Subject: [GNU Libtool 2.4.6] testsuite: 70 117 138 139 144 156 157 158 170 failed
--- a/components/libtool/test/results-64.master	Tue Jan 10 17:35:21 2017 -0800
+++ b/components/libtool/test/results-64.master	Tue Jan 10 13:28:05 2017 -0800
@@ -1,127 +1,11 @@
-PASS: tests/link.test
-PASS: tests/link-2.test
-PASS: tests/nomode.test
-PASS: tests/objectlist.test
-PASS: tests/quote.test
-PASS: tests/sh.test
-PASS: tests/suffix.test
-PASS: tests/tagtrace.test
-PASS: tests/cdemo-static.test
-PASS: tests/cdemo-static-make.test
-PASS: tests/cdemo-static-exec.test
-PASS: tests/demo-static.test
-PASS: tests/demo-static-make.test
-PASS: tests/demo-static-exec.test
-PASS: tests/demo-static-inst.test
-PASS: tests/demo-static-unst.test
-PASS: tests/depdemo-static.test
-PASS: tests/depdemo-static-make.test
-PASS: tests/depdemo-static-exec.test
-PASS: tests/depdemo-static-inst.test
-PASS: tests/depdemo-static-unst.test
-PASS: tests/mdemo-static.test
-PASS: tests/mdemo-static-make.test
-PASS: tests/mdemo-static-exec.test
-PASS: tests/mdemo-static-inst.test
-PASS: tests/mdemo-static-unst.test
-PASS: tests/cdemo-conf.test
-PASS: tests/cdemo-make.test
-PASS: tests/cdemo-exec.test
-PASS: tests/demo-conf.test
-PASS: tests/demo-make.test
-PASS: tests/demo-exec.test
-PASS: tests/demo-inst.test
-PASS: tests/demo-unst.test
-PASS: tests/demo-deplibs.test
-PASS: tests/depdemo-conf.test
-PASS: tests/depdemo-make.test
-PASS: tests/depdemo-exec.test
-PASS: tests/depdemo-inst.test
-PASS: tests/depdemo-unst.test
-PASS: tests/mdemo-conf.test
-PASS: tests/mdemo-make.test
-PASS: tests/mdemo-exec.test
-PASS: tests/mdemo-inst.test
-PASS: tests/mdemo-unst.test
-PASS: tests/mdemo-dryrun.test
-PASS: tests/mdemo2-conf.test
-PASS: tests/mdemo2-make.test
-PASS: tests/mdemo2-exec.test
-PASS: tests/pdemo-conf.test
-PASS: tests/pdemo-make.test
-PASS: tests/pdemo-exec.test
-PASS: tests/pdemo-inst.test
-PASS: tests/demo-nofast.test
-PASS: tests/demo-nofast-make.test
-PASS: tests/demo-nofast-exec.test
-PASS: tests/demo-nofast-inst.test
-PASS: tests/demo-nofast-unst.test
-PASS: tests/depdemo-nofast.test
-PASS: tests/depdemo-nofast-make.test
-PASS: tests/depdemo-nofast-exec.test
-PASS: tests/depdemo-nofast-inst.test
-PASS: tests/depdemo-nofast-unst.test
-PASS: tests/demo-pic.test
-PASS: tests/demo-pic-make.test
-PASS: tests/demo-pic-exec.test
-SKIP: tests/demo-nopic.test
-PASS: tests/demo-nopic-make.test
-PASS: tests/demo-nopic-exec.test
-PASS: tests/cdemo-shared.test
-PASS: tests/cdemo-shared-make.test
-PASS: tests/cdemo-shared-exec.test
-PASS: tests/mdemo-shared.test
-PASS: tests/mdemo-shared-make.test
-PASS: tests/mdemo-shared-exec.test
-PASS: tests/mdemo-shared-inst.test
-PASS: tests/mdemo-shared-unst.test
-PASS: tests/cdemo-undef.test
-PASS: tests/cdemo-undef-make.test
-PASS: tests/cdemo-undef-exec.test
-PASS: tests/tagdemo-static.test
-PASS: tests/tagdemo-static-make.test
-PASS: tests/tagdemo-static-exec.test
-PASS: tests/tagdemo-conf.test
-PASS: tests/tagdemo-make.test
-PASS: tests/tagdemo-exec.test
-PASS: tests/tagdemo-shared.test
-PASS: tests/tagdemo-shared-make.test
-PASS: tests/tagdemo-shared-exec.test
-PASS: tests/tagdemo-undef.test
-PASS: tests/tagdemo-undef-make.test
-PASS: tests/tagdemo-undef-exec.test
-PASS: tests/fcdemo-static.test
-SKIP: tests/fcdemo-static-make.test
-SKIP: tests/fcdemo-static-exec.test
-PASS: tests/fcdemo-conf.test
-SKIP: tests/fcdemo-make.test
-SKIP: tests/fcdemo-exec.test
-PASS: tests/fcdemo-shared.test
-SKIP: tests/fcdemo-shared-make.test
-SKIP: tests/fcdemo-shared-exec.test
-PASS: tests/demo-shared.test
-PASS: tests/demo-shared-make.test
-PASS: tests/demo-shared-exec.test
-PASS: tests/demo-shared-inst.test
-FAIL: tests/demo-hardcode.test
-PASS: tests/demo-relink.test
-PASS: tests/demo-noinst-link.test
-PASS: tests/demo-shared-unst.test
-PASS: tests/depdemo-shared.test
-PASS: tests/depdemo-shared-make.test
-PASS: tests/depdemo-shared-exec.test
-PASS: tests/depdemo-shared-inst.test
-PASS: tests/depdemo-relink.test
-PASS: tests/depdemo-shared-unst.test
-FAIL: tests/f77demo-static.test
-SKIP: tests/f77demo-static-make.test
-SKIP: tests/f77demo-static-exec.test
-FAIL: tests/f77demo-conf.test
-SKIP: tests/f77demo-make.test
-SKIP: tests/f77demo-exec.test
-FAIL: tests/f77demo-shared.test
-SKIP: tests/f77demo-shared-make.test
-SKIP: tests/f77demo-shared-exec.test
-====================================
-4 of 111 tests failed
-====================================
+ 70: Runpath in libtool library files                FAILED (runpath-in-lalib.at:61)
+117: enforced lib prefix                             FAILED (need_lib_prefix.at:182)
+138: shared library                                  FAILED (tagdemo.at:359)
+139: shared and static together                      FAILED (tagdemo.at:374)
+144: C++ exception handling                          FAILED (exceptions.at:373)
+153: static library                                  FAILED (f77demo.at:303)
+154: shared library                                  FAILED (f77demo.at:318)
+155: shared and static together                      FAILED (f77demo.at:333)
+170: Run tests with low max_cmd_len                  FAILED (cmdline_wrap.at:47)
+14 failed (5 expected failures).
+   Subject: [GNU Libtool 2.4.6] testsuite: 70 117 138 139 144 153 154 155 170 failed