--- a/open-src/common/Makefile.inc Thu Apr 19 17:50:03 2012 -0700
+++ b/open-src/common/Makefile.inc Fri Apr 20 09:14:15 2012 -0700
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules commonly shared among X consolidation open source dirs
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -484,7 +484,6 @@
# and use automake 1.10 instead of the older 1.9.
ACLOCAL_PATH=/usr/bin/aclocal-1.10
ACLOCAL_INCLUDES = -I $(PROTODIR)$(X11_ACLOCAL_DIR) \
- -I $(TOOLS_ACLOCAL_DIR) \
-I /usr/share/aclocal -I /usr/share/aclocal-1.10
AUTOMAKE_PATH=/usr/bin/automake-1.10
AUTORECONF_ENV= ACLOCAL="$(ACLOCAL_PATH) $(ACLOCAL_INCLUDES)" \
--- a/open-src/common/Makefile.init Thu Apr 19 17:50:03 2012 -0700
+++ b/open-src/common/Makefile.init Fri Apr 20 09:14:15 2012 -0700
@@ -288,7 +288,6 @@
# Directory used for installing tools used during build but not
# delivered in packages
TOOLS_DIR=$(PROTOTOP)/tools_$(MACH)
-TOOLS_ACLOCAL_DIR=$(TOOLS_DIR)/share/aclocal
# Work around _TIME, _DATE, embedded date chatter in component builds
# to use, set TIME_CONSTANT in the component Makefile and add $(CONSTANT_TIME)
--- a/open-src/util/util-macros/Makefile Thu Apr 19 17:50:03 2012 -0700
+++ b/open-src/util/util-macros/Makefile Fri Apr 20 09:14:15 2012 -0700
@@ -47,9 +47,6 @@
# Need to autoreconf after running source_fix_pkgname
AUTORECONF=yes
-# Additional install rules beyond what upstream installs
-MODULE_ADD_INSTALL_TARGETS=install_libtool_fix
-
# xorg-macro pkg-config files are architecture independent, so install in share
MODTYPE_PKGCONFIG_DIR=$(PKGCONFIG_DIR_SHARE)
MODTYPE_PKGCONFIG_DIR_SET=yes
@@ -63,32 +60,8 @@
$(PERL) -i.orig -p -e 's{util-macros}{xorg-macros}g' \
$(SOURCE_DIR)/configure.ac
-# Libtool versions before 2.2.2 fail to work with LD=cc in 64 bit builds,
-# so install fixed libtool m4 macros here as well, so that modules that
-# run autoreconf get the fixed sources
-#
-# S11U1 now has libtool 2.4.2, but not everyone has updated yet to a build
-# with the new version, so for now, we check the version number before trying
-# to apply the patch, to avoid failures on versions with the bug already fixed.
-# This will be removed in the future, once everyone has had a chance to upgrade.
-install_libtool_fix: $(TOOLS_ACLOCAL_DIR)/libtool.m4
+# autoreconf fails if the aclocal include directories don't exist yet
+$(AUTOCONF_TARGET): $(PROTODIR)$(X11_ACLOCAL_DIR)
-$(TOOLS_ACLOCAL_DIR)/libtool.m4: $(TOOLS_ACLOCAL_DIR) libtool-64.patch
- -rm -f $(TOOLS_ACLOCAL_DIR)/libtool.m4
- SYSTEM_ACLOCAL_DIR=$$($(ACLOCAL_PATH) --print-ac-dir) ; \
- cp $${SYSTEM_ACLOCAL_DIR}/libtool.m4 \
- $(TOOLS_ACLOCAL_DIR)/libtool.m4
- @libtool_version=$$(libtool --version | \
- awk '/^libtool / {print $$NF ; exit}') ; \
- if [[ $${libtool_version%%.[0-9.]*} -lt 2 ]] ; then \
- $(START_CMD_ECHO) ; \
- gpatch -d $(TOOLS_ACLOCAL_DIR) < libtool-64.patch ; \
- else \
- print 'libtool version 2 in use, skipping libtool-64.patch' ; \
- fi
-
-# autoreconf fails if the aclocal include directories don't exist yet
-$(AUTOCONF_TARGET): $(TOOLS_ACLOCAL_DIR) $(PROTODIR)$(X11_ACLOCAL_DIR)
-
-$(TOOLS_ACLOCAL_DIR) $(PROTODIR)$(X11_ACLOCAL_DIR):
+$(PROTODIR)$(X11_ACLOCAL_DIR):
mkdir -p $@
--- a/open-src/util/util-macros/libtool-64.patch Thu Apr 19 17:50:03 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=libtool.git;a=blobdiff_plain;f=libltdl%2Fm4%2Flibtool.m4;h=e34cbc4e18485482467934c71d0935bb51433f88;hp=75f1e0e7a03352c7e5f1f30e84f2f95a9b094d33;hb=c177a3000006e39143735520d957f6873b9bd2fe;hpb=35526d6c6431f3bde46751b514584639b60c547c
-
-diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
-index 75f1e0e..e34cbc4 100644
---- a/libltdl/m4/libtool.m4
-+++ b/libltdl/m4/libtool.m4
-@@ -1201,7 +1201,11 @@ sparc*-*solaris*)
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *) LD="${LD-ld} -64" ;;
-+ *)
-+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+ LD="${LD-ld} -64"
-+ fi
-+ ;;
- esac
- ;;
- esac
--- a/pkg/manifests/developer-opensolaris-X.p5m Thu Apr 19 17:50:03 2012 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m Fri Apr 20 09:14:15 2012 -0700
@@ -65,7 +65,8 @@
depend type=require fmri=pkg:/developer/build/gnu-make
# Many packages need to use GNU libtool to rebuild upstream libtool files
-depend type=require fmri=pkg:/developer/build/libtool
+# To build 64-bit libraries correctly, we need libtool 2.2.2 or later
+depend type=require fmri=pkg:/developer/build/[email protected]
# Most of the X gate requires Solaris make to build
depend type=require fmri=pkg:/developer/build/make