smartos-live#67 Support compiling cpp with gcc.

smartos-live#91 make world fails on trying to include zlib.h
OS-1258 Update vim to 7.3 in SmartOS from 7.2
OS-1303 smartos-live src_addon can die
OS-1305 illumos-extra should not put libuuid.a into the proto area, ever
OS-1309 illumos-extra makefiles need refactoring
OS-1311 nspr and openssl create bogus 64-bit links in the proto area

Author: Keith M Wesolowski

.gitignore

@@ -1,9 +1,9 @@
-/bash/bash-4.1
+/bash/bash-4.1-32
+/bind/bind-9.8.0-32
 /bzip2/bzip2-1.0.6
-/bzip2/bzip2-1.0.6-64
-/coreutils/coreutils-8.13
-/curl/curl-7.21.2
-/dialog/dialog-1.1-20111020/
+/coreutils/coreutils-8.13-32
+/curl/curl-7.21.2-32
+/dialog/dialog-1.1-20111020-32
 /g11n/proto/
 /g11n/src/lib/iconv/common/amd64/
 /g11n/src/lib/iconv/common/*.o
@@ -16,44 +16,42 @@
 /g11n/src/lib/iconv/utf-8/*.bt
 /g11n/src/lib/iconv/utf-8/*.o
 /g11n/src/lib/iconv/utf-8/*.so
-/gcc/gcc-3.4.3
-/gcc/gcc-3.4.3-i386-build
+/gcc4/gcc-4.4.4-32
 /gcc4/gcc-4.4.4-i386-build
-/gcc4/gcc-4.4.4
-/gnupg/gnupg-1.4.11
-/gtar/tar-1.23
-/gzip/gzip-1.3.5
-/less/less-436
-/libexpat/expat-2.0.1
+/gnupg/gnupg-1.4.11-32
+/gtar/tar-1.23-32
+/gzip/gzip-1.3.5-32
+/less/less-436-32
+/libexpat/expat-2.0.1-32
 /libexpat/expat-2.0.1-64
-/libidn/libidn-1.11
+/libidn/libidn-1.11-32
 /libm/destdir
 /libm/statdir
 /libm/usr/src/libm/wos/f80387
 /libm/usr/src/libm/wos/libmvec
 /libm/usr/src/libm/wos64/amd64
 /libxml/libxml2-2.7.6
 /libxml/libxml2-2.7.6-64
-/libz/zlib-1.2.3
+/libz/zlib-1.2.3-32
 /libz/zlib-1.2.3-64
-/ncurses/ncurses-5.7
+/ncurses/ncurses-5.7-32
 /ncurses/ncurses-5.7-64
-/node.js/node-v0.6.17
-/nss-nspr/nss-3.12.8
+/node.js/node-v0.6.17-32
+/nss-nspr/nss-3.12.8-32
 /nss-nspr/nss-3.12.8-64
-/ntp/ntp-dev-4.2.5p200
-/openldap/openldap-2.4.26/
-/openssl/openssl-0.9.8o
-/openssl/openssl-0.9.8o-64
-/pbzip2/pbzip2-1.1.6
-/perl/perl-5.12.3
+/ntp/ntp-dev-4.2.5p200-32
+/openldap/openldap-2.4.26-32
+/openssl/openssl-0.9.8w
+/openssl/openssl-0.9.8w-64
+/pbzip2/pbzip2-1.1.6-32
+/perl/perl-5.12.3-32
 /proto
-/rsync/rsync-3.0.6
-/rsyslog/rsyslog-5.8.9
-/screen/screen-4.0.3
-/socat/socat-1.7.1.3/
-/tun/tun-1.1
-/uuid/uuid-1.6.2
-/vim/vim72
-/wget/wget-1.12
+/rsync/rsync-3.0.6-32
+/rsyslog/rsyslog-5.8.9-32
+/screen/screen-4.0.3-32
+/socat/socat-1.7.1.3-32
+/tun/tun-1.1-64
+/uuid/uuid-1.6.2-32
+/vim/vim73-32
+/wget/wget-1.12-32
 /illumos-extra-*.tgz

Makefile

@@ -23,29 +23,78 @@
 # To build everything just run 'gmake' in this directory.
 #
 
-BASE=$(PWD)
-DESTDIR=$(BASE)/proto
-PATH=$(DESTDIR)/usr/bin:/usr/sfw/bin:/usr/gnu/bin:/opt/local/bin:/sbin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/opt/local/bin
-SUBDIRS= bash bzip2 coreutils curl dialog g11n gnupg gtar gzip less libexpat \
-	libidn libm libxml libz ncurses node.js nss-nspr ntp openldap openssl \
-	pbzip2 perl rsync rsyslog screen socat tun uuid vim wget
+BASE =		$(PWD)
+DESTDIR =	$(BASE)/proto
+PATH =		$(DESTDIR)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
+SUBDIRS = \
+	bash \
+	bind \
+	bzip2 \
+	coreutils \
+	cpp \
+	curl \
+	dialog \
+	g11n \
+	gnupg \
+	gtar \
+	gzip \
+	ipmitool \
+	less \
+	libexpat \
+	libidn \
+	libm \
+	libxml \
+	libz \
+	ncurses \
+	node.js \
+	nss-nspr \
+	ntp \
+	openldap \
+	openssl \
+	pbzip2 \
+	perl \
+	rsync \
+	rsyslog \
+	screen \
+	socat \
+	tun \
+	uuid \
+	vim \
+	wget
 
-PARALLEL=-j128
+STRAP_SUBDIRS = \
+	cpp \
+	bzip2 \
+	libexpat \
+	libidn \
+	libm \
+	libxml \
+	libz \
+	nss-nspr \
+	openssl
 
-NAME=illumos-extra
+NAME =	illumos-extra
 
-AWK=$(shell (which gawk 2>/dev/null | grep -v "^no ") || which awk)
-BRANCH=$(shell git symbolic-ref HEAD | $(AWK) -F/ '{print $$3}')
+AWK =		$(shell (which gawk 2>/dev/null | grep -v "^no ") || which awk)
+BRANCH =	$(shell git symbolic-ref HEAD | $(AWK) -F/ '{print $$3}')
 
 ifeq ($(TIMESTAMP),)
-  TIMESTAMP=$(shell date -u "+%Y%m%dT%H%M%SZ")
+  TIMESTAMP =	$(shell date -u "+%Y%m%dT%H%M%SZ")
 endif
 
-GITDESCRIBE=g$(shell git describe --all --long | $(AWK) -F'-g' '{print $$NF}')
-TARBALL=$(NAME)-$(BRANCH)-$(TIMESTAMP)-$(GITDESCRIBE).tgz
+GITDESCRIBE = \
+	g$(shell git describe --all --long | $(AWK) -F'-g' '{print $$NF}')
+
+TARBALL =	$(NAME)-$(BRANCH)-$(TIMESTAMP)-$(GITDESCRIBE).tgz
 
 all: $(SUBDIRS)
 
+strap: $(STRAP_SUBDIRS)
+
+curl: libz openssl
+gzip: libz
+node.js: openssl
+
 #
 # pkg-config may be installed. This will actually only hurt us rather than help
 # us. pkg-config is based as a part of the pkgsrc packages and will pull in
@@ -55,15 +104,20 @@ all: $(SUBDIRS)
 # gets appended.
 #
 $(DESTDIR)/usr/bin/gcc: FRC
-	cd gcc4; PKG_CONFIG_LIBDIR="" $(MAKE) PARALLEL=$(PARALLEL) DESTDIR=$(DESTDIR) install
+	(cd gcc4 && \
+	    PKG_CONFIG_LIBDIR="" $(MAKE) DESTDIR=$(DESTDIR) install)
 
 $(SUBDIRS): $(DESTDIR)/usr/bin/gcc
-	cd $@; PKG_CONFIG_LIBDIR="" $(MAKE) PARALLEL=$(PARALLEL) DESTDIR=$(DESTDIR) install
+	(cd $@ && \
+	    PKG_CONFIG_LIBDIR="" $(MAKE) DESTDIR=$(DESTDIR) install)
 
 install: $(SUBDIRS) gcc4
 
+install_strap: $(STRAP_SUBDIRS) gcc4
+
 clean: 
-	-for dir in $(SUBDIRS) gcc4; do (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) clean); done
+	-for dir in $(SUBDIRS) gcc4; \
+	    do (cd $$dir; $(MAKE) DESTDIR=$(DESTDIR) clean); done
 	-rm -rf proto
 
 manifest:

Makefile.defs

@@ -0,0 +1,109 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at COPYING
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at COPYING.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2012, Joyent, Inc.
+#
+
+BASE =		$(PWD)
+DESTDIR =	$(BASE)/../proto
+VER.32 =	$(VER)-32
+VER.64 =	$(VER)-64
+
+PATH =		$(DESTDIR)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
+
+MAKE =		gmake
+PARALLEL =	-j128
+GCC =		$(DESTDIR)/usr/bin/gcc
+GXX =		$(DESTDIR)/usr/bin/g++
+GCC.64 =	$(GCC) -m64
+GXX.64 =	$(GXX) -m64
+
+SYSINCDIRS =	/usr/include
+SYSLIBDIRS =	/usr/lib /lib
+
+BUILD32 =	yes
+BUILD64 =
+
+CPPFLAGS =	$(SYSINCDIRS:%=-isystem $(DESTDIR)/%)
+LDFLAGS =	$(SYSLIBDIRS:%=-L$(DESTDIR)/%)
+LDFLAGS.64 =	$(SYSLIBDIRS:%=-L$(DESTDIR)/%/64)
+
+AUTOCONF_CC =		CC="$(GCC)"
+AUTOCONF_CXX =		CXX="$(GXX)"
+AUTOCONF_CC.64 =	CC="$(GCC.64)"
+AUTOCONF_CXX.64 =	CXX="$(GXX.64)"
+AUTOCONF_CPPFLAGS =	CPPFLAGS="$(CPPFLAGS)"
+AUTOCONF_CFLAGS =	CFLAGS="$(CFLAGS)"
+AUTOCONF_CFLAGS.64 =	CFLAGS="$(CFLAGS.64)"
+AUTOCONF_LDFLAGS =	LDFLAGS="$(LDFLAGS)"
+AUTOCONF_LDFLAGS.64 =	LDFLAGS="$(LDFLAGS.64)"
+AUTOCONF_LIBS =		LIBS="$(LIBS)"
+AUTOCONF_LIBS.64 =	LIBS="$(LIBS.64)"
+
+AUTOCONF_OUT =		config.status
+AUTOCONF_OUT.32 =	$(VER.32)/$(AUTOCONF_OUT)
+AUTOCONF_OUT.64 =	$(VER.64)/$(AUTOCONF_OUT)
+
+AUTOCONF_PREFIX =	/usr
+
+AUTOCONF_ENV = \
+	PKG_CONFIG_LIBDIR="" \
+	$(AUTOCONF_CC) \
+	$(AUTOCONF_CXX) \
+	$(AUTOCONF_CPPFLAGS) \
+	$(AUTOCONF_CFLAGS) \
+	$(AUTOCONF_LDFLAGS) \
+	$(AUTOCONF_LIBS)
+
+AUTOCONF_ENV.64 = \
+	PKG_CONFIG_LIBDIR="" \
+	$(AUTOCONF_CC.64) \
+	$(AUTOCONF_CXX.64) \
+	$(AUTOCONF_CPPFLAGS) \
+	$(AUTOCONF_CFLAGS.64) \
+	$(AUTOCONF_LDFLAGS.64) \
+	$(AUTOCONF_LIBS.64)
+
+AUTOCONF_OPTS = \
+	--prefix=$(AUTOCONF_PREFIX)
+
+AUTOCONF_OPTS.64 = \
+	$(AUTOCONF_OPTS)
+
+TARBALL =		$(VER).tar.gz
+TARBALL_COMPRESS =	-z
+
+UNPACK_SENTINEL =	configure
+FROB_SENTINEL.32 =	chmod 755 $(VER.32)/$(UNPACK_SENTINEL)
+FROB_SENTINEL.64 =	chmod 755 $(VER.64)/$(UNPACK_SENTINEL)
+
+PATCHSTRIP =	1
+
+APPLY_PATCHES.32 = \
+	for p in $(PATCHES); do [ -f "$$p" ] && \
+	    (cd .unpack32/$(VER) && gpatch -p$(PATCHSTRIP) < "../../$$p"); \
+	    done
+
+APPLY_PATCHES.64 = \
+	for p in $(PATCHES); do [ -f "$$p" ] && \
+	    (cd .unpack64/$(VER) && gpatch -p$(PATCHSTRIP) < "../../$$p"); \
+	    done
+
+.DEFAULT_GOAL =		all

Makefile.targ

@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at COPYING
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at COPYING.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2012, Joyent, Inc.
+#
+
+all_autoconf: $(BUILD32:yes=all_autoconf_32) $(BUILD64:yes=all_autoconf_64)
+
+all_autoconf_32: $(AUTOCONF_OUT.32)
+	(cd $(VER.32); env - PATH=$(PATH) $(MAKE) $(PARALLEL) $(OVERRIDES))
+
+all_autoconf_64: $(AUTOCONF_OUT.64)
+	(cd $(VER.64); env - PATH=$(PATH) $(MAKE) $(PARALLEL) $(OVERRIDES.64))
+
+install_autoconf: $(BUILD32:yes=install_autoconf_32) \
+    $(BUILD64:yes=install_autoconf_64)
+
+install_autoconf_32: all
+	mkdir -p $(DESTDIR)
+	(cd $(VER.32); \
+	    env - PATH=$(PATH) \
+	    $(MAKE) $(install_PARALLEL) DESTDIR=$(DESTDIR) install)
+
+install_autoconf_64: all
+	mkdir -p $(DESTDIR)
+	(cd $(VER.64); \
+	    env - PATH=$(PATH) \
+	    $(MAKE) $(install_PARALLEL) DESTDIR=$(DESTDIR) install)
+
+$(AUTOCONF_OUT.32): $(VER.32)/configure
+	(cd $(VER.32); \
+	    env - PATH=$(PATH) $(AUTOCONF_ENV) \
+	    ./configure $(AUTOCONF_OPTS))
+
+$(AUTOCONF_OUT.64): $(VER.64)/configure
+	(cd $(VER.64); \
+	    env - PATH=$(PATH) $(AUTOCONF_ENV.64) \
+	    ./configure $(AUTOCONF_OPTS.64))
+
+$(VER.32)/$(UNPACK_SENTINEL): $(TARBALL)
+	-rm -rf $(VER.32)
+	mkdir -p .unpack32
+	gtar x -C .unpack32 $(TARBALL_COMPRESS) --no-same-owner -f $(TARBALL)
+	$(APPLY_PATCHES.32)
+	mv -f .unpack32/$(VER) ./$(VER.32)
+	-rmdir .unpack32
+	$(FROB_SENTINEL.32)
+	touch $(VER.32)/$(UNPACK_SENTINEL)
+
+$(VER.64)/$(UNPACK_SENTINEL): $(TARBALL)
+	-rm -rf $(VER.64)
+	mkdir -p .unpack64
+	gtar x -C .unpack64 $(TARBALL_COMPRESS) --no-same-owner -f $(TARBALL)
+	$(APPLY_PATCHES.64)
+	mv -f .unpack64/$(VER) ./$(VER.64)
+	-rmdir .unpack64
+	$(FROB_SENTINEL.64)
+	touch $(VER.64)/$(UNPACK_SENTINEL)
+
+clean:
+	-rm -rf $(VER) $(VER.32) $(VER.64) .unpack32 .unpack64 $(CLEANFILES)