# HG changeset patch
# User Binjih Lin <binjih.lin@oracle.com>
# Date 1471999223 25200
# Node ID 2940c23026c1fc9b89bb4791213418c0831952a1
# Parent  6e93d2f59ffbfab138f1d6a0fe095621dd7996d0
23010295 remove libtool's old version 1.5.22 and its links libltdl.so.3

diff -r 6e93d2f59ffb -r 2940c23026c1 components/libtool/Makefile
--- a/components/libtool/Makefile	Wed Aug 24 11:32:05 2016 -0700
+++ b/components/libtool/Makefile	Tue Aug 23 17:40:23 2016 -0700
@@ -34,17 +34,6 @@
 
 TPNO=			9088
 
-# For now, we want to continue to provide the libltdl.so's (and their
-# links) from libtool 1.5.22.
-#
-COMPONENT_VERSION_1 =	1.5.22
-COMPONENT_SRC_1 =	$(COMPONENT_NAME)-$(COMPONENT_VERSION_1)
-COMPONENT_ARCHIVE_1 =	$(COMPONENT_SRC_1).tar.gz
-COMPONENT_ARCHIVE_HASH_1 = \
-    sha256:88e9ffaaade21c1ddaf6297723dd2fb4ca18ccaef0499a28b6e672f02c8ceb5d
-COMPONENT_ARCHIVE_URL_1 = http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE_1)
-SOURCE_DIR_1 =		$(COMPONENT_DIR)/$(COMPONENT_SRC_1)
-
 BUILD_TARGET=
 INSTALL_TARGET=
 include $(WS_MAKE_RULES)/gnu-component.mk
@@ -53,37 +42,16 @@
 CONFIGURE_OPTIONS  +=		--disable-static
 CONFIGURE_OPTIONS  +=		PERL="$(PERL)"
 
-# requires an older automake to reconfigure.
-COMPONENT_PREP_ACTION = \
-	(cd $(@D) ; ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 ./bootstrap)
+COMPONENT_PREP_ACTION = (cd $(@D) ; ./bootstrap)
 
-# Remove the hard-wired compiler locations in the LTCC and two CC lines
-# in the two versions of the libtool script.
+# Remove the hard-wired compiler locations in the LTCC and CC line
+# in the version of the libtool script.
 COMPONENT_POST_INSTALL_ACTION = \
 	cd $(PROTO_DIR)$(USRBIN.$(BITS)); \
 	$(GSED) -i \
 		-e 's|^LTCC="/.*$$|LTCC="cc"|' \
 		-e 's|^CC="/.*$$|CC="cc"|' libtool ; \
 
-# Macros to configure, build, and install the old version for the time being.
-BUILD_OLD_DIR_32 = $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH32)
-BUILD_OLD_DIR_64 = $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH64)
-
-$(BUILD_OLD_DIR_32)/.configured: CONFIGURE_SCRIPT = $(SOURCE_DIR_1)/configure
-$(BUILD_OLD_DIR_64)/.configured: CONFIGURE_SCRIPT = $(SOURCE_DIR_1)/configure
-$(BUILD_OLD_DIR_32)/.configured:	BITS=32
-$(BUILD_OLD_DIR_64)/.configured:	BITS=64
-
-BUILD_32 += $(BUILD_OLD_DIR_32)/.built
-BUILD_64 += $(BUILD_OLD_DIR_64)/.built
-
-INSTALL_32 += $(BUILD_OLD_DIR_32)/.installed
-INSTALL_64 += $(BUILD_OLD_DIR_64)/.installed
-
-# install the old version first
-$(BUILD_DIR_32)/.installed:	$(BUILD_OLD_DIR_32)/.installed
-$(BUILD_DIR_64)/.installed:	$(BUILD_OLD_DIR_64)/.installed
-
 COMPONENT_TEST_TRANSFORMS += \
 	'-n ' \
 	'-e "/SKIP/p" ' \
diff -r 6e93d2f59ffb -r 2940c23026c1 components/libtool/libltdl.p5m
--- a/components/libtool/libltdl.p5m	Wed Aug 24 11:32:05 2016 -0700
+++ b/components/libtool/libltdl.p5m	Tue Aug 23 17:40:23 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -32,13 +32,9 @@
 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.3 target=libltdl.so.3.1.4
-file path=usr/lib/$(MACH64)/libltdl.so.3.1.4
 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.3 target=libltdl.so.3.1.4
-file path=usr/lib/libltdl.so.3.1.4
 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