--- a/components/a2ps/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/a2ps/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -67,6 +67,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/aalib/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/aalib/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -65,6 +65,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/antlr/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/antlr/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -67,6 +67,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/apache2-modules/mod_jk/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apache2-modules/mod_jk/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
test: $(NO_TESTS)
--- a/components/apache2-modules/mod_security2/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apache2-modules/mod_security2/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
test: $(TEST_32_and_64)
--- a/components/apache2-modules/mod_wsgi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apache2-modules/mod_wsgi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -74,6 +74,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/apache2/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apache2/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -111,6 +111,8 @@
PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
endif
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
AP_CONFIG_LAYOUT_H=include/ap_config_layout.h
--- a/components/apache24/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apache24/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -71,6 +71,8 @@
COMPONENT_POST_INSTALL_ACTION += ($(KSH93) Solaris/customization.sh $(PROTO_DIR))
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/apr-1_5/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apr-1_5/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -75,6 +75,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/apr-util-1_5/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/apr-util-1_5/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -74,6 +74,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/asciidoc/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/asciidoc/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -64,6 +64,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/autoconf/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/autoconf/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/autogen/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/autogen/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -65,6 +65,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/automake/automake-1.10/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/automake/automake-1.10/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -48,6 +48,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/automake/automake-1.11.2/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/automake/automake-1.11.2/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -47,6 +47,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/bash/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/bash/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -129,6 +129,8 @@
ASLR_MODE=$(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/berkeleydb/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/berkeleydb/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -102,6 +102,8 @@
LICENSE_TRANSFORMS =
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/bind/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/bind/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -76,6 +76,8 @@
ASLR_MODE = $(ASLR_ENABLE)
.PHONY: build
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
include ../../make-rules/shared-targets.mk
--- a/components/binutils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/binutils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -66,6 +66,8 @@
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)"
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/bison/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/bison/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -53,6 +53,8 @@
$(INSTALL_32): $(INSTALL_64)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/clisp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/clisp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -105,6 +105,8 @@
COMPONENT_TEST_ENV += PATH="$(GNUBIN):$(PATH)"
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/cmake/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/cmake/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -78,6 +78,8 @@
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/conflict/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/conflict/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -64,6 +64,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/coreutils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/coreutils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -60,6 +60,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/cups/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/cups/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -87,6 +87,8 @@
$(MV) $(PROTOUSRLIBDIR)/64 $(PROTOUSRLIBDIR)/$(MACH64)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
include ../../make-rules/shared-targets.mk
--- a/components/curl/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/curl/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -80,6 +80,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/cvs/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/cvs/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -50,6 +50,8 @@
COMPONENT_TEST_ENV += PATH=$(GNUBIN):$(PATH)
COMPONENT_TEST_TARGETS = localcheck
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/daq/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/daq/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -53,6 +53,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/dejagnu/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/dejagnu/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/diffutils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/diffutils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -52,6 +52,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/doxygen/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/doxygen/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -73,6 +73,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ejabberd/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ejabberd/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -61,6 +61,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/elinks/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/elinks/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/emacs/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/emacs/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -175,6 +175,8 @@
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(BUILD_64) $(BUILD_DIR)/$(MACH64)-x/.installed
--- a/components/enscript/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/enscript/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -76,6 +76,8 @@
$(PROTOUSRBINDIR)/$(MACH64)/nenscript
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/erlang/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/erlang/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -110,6 +110,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/fastcgi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/fastcgi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
COMPONENT_PREP_ACTION = (cd $(@D) ; touch NEWS AUTHORS ChangeLog ; autoreconf -if)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/fetchmail/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/fetchmail/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
$(PROTO_DIR)$(USRBIN.32)/fetchmailconf
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/findutils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/findutils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/flex/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/flex/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -63,6 +63,8 @@
ASLR_MODE=$(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/foomatic/db-engine/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/foomatic/db-engine/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -64,6 +64,8 @@
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/foomatic/db/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/foomatic/db/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/foomatic/filters/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/foomatic/filters/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/fping/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/fping/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -50,6 +50,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gawk/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gawk/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -48,6 +48,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gcc3/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gcc3/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -77,6 +77,8 @@
COMPONENT_BUILD_TARGETS = bootstrap
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
$(PROTO_DIR)/.sedded: $(INSTALL_32)
--- a/components/gcc45/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gcc45/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -98,6 +98,8 @@
COMPONENT_TEST_CMD = ulimit -Ss 16384 ; $(GMAKE)
COMPONENT_TEST_ARGS = -k -i
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/gcc47/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gcc47/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -110,6 +110,8 @@
# Disable ASLR for now.
ASLR_MODE=$(ASLR_DISABLE)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/gcc48/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gcc48/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -116,6 +116,8 @@
# Disable ASLR for now.
ASLR_MODE=$(ASLR_DISABLE)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/gd2/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gd2/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -64,6 +64,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/gdb/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gdb/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -131,6 +131,8 @@
ASLR_MODE=$(ASLR_DISABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gdbm/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gdbm/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -47,6 +47,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/gettext/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gettext/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/ggrep/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ggrep/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -59,6 +59,8 @@
unexport SHELLOPTS
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ghostscript/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ghostscript/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -102,6 +102,9 @@
CONFIGURE_SCRIPT = ./configure
+# configure gs and ijs
+configure: $(VARIANTS:%=%/.configured)
+
# build gs and ijs
build: $(VARIANTS:%=%/.built)
--- a/components/git/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/git/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -77,6 +77,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64) $(BUILD_DIR)/.manpages
--- a/components/gnump/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gnump/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -153,6 +153,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/gnupg/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gnupg/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -106,6 +106,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gnuplot/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gnuplot/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -60,6 +60,8 @@
include ../../make-rules/shared-targets.mk
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gnupth/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gnupth/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -71,6 +71,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/gocr/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gocr/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gperf/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gperf/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -47,6 +47,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gpgme/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gpgme/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -77,6 +77,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/graphviz/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/graphviz/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -91,6 +91,8 @@
# We build 32 and 64 bit because we build libraries, and we build modules for
# runtimes which provide 64 or 32 (or both) bit environments.
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/groff/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/groff/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -93,6 +93,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/gtar/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gtar/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/guile/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/guile/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/gutenprint/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gutenprint/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -53,6 +53,8 @@
COMPONENT_BUILD_TARGETS = all
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/gzip/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/gzip/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -88,6 +88,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64) $(GZGREP_MAN_VARIANTS)
--- a/components/hal-cups-utils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/hal-cups-utils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -58,6 +58,8 @@
$(PERL) -pi -e 's,^\#!.*?python,\#!$(USED_PYTHON), if $$.==1' systemv/hal_lpadmin ; \
)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/hexedit/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/hexedit/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -56,6 +56,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/hplip/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/hplip/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -98,6 +98,8 @@
# build it twice. Once for the HPIJS support used by LP and once for the rest
# of the support used for CUPS and SANE.
#
+configure: $(VARIANTS:%=%/.configured)
+
build: $(VARIANTS:%=%/.built)
install: $(VARIANTS:%=%/.installed)
--- a/components/iftop/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/iftop/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -61,6 +61,8 @@
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ilmbase/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ilmbase/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -62,6 +62,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/imagemagick/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/imagemagick/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -93,6 +93,8 @@
# common targets
#
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
# Remove build machine runpath from libMagick++-6.Q16.so.1.0.0 and
--- a/components/indent/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/indent/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/indri/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/indri/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -65,6 +65,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/iperf/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/iperf/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -56,6 +56,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ircii/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ircii/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -73,6 +73,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/isc-dhcp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/isc-dhcp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
COMPONENT_TEST_DIR = $(@D)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: build $(INSTALL_32) $(PROTO_DIR)/dhcpd.leases
--- a/components/jansson/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/jansson/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -47,6 +47,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/lcms/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/lcms/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -89,6 +89,8 @@
LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/less/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/less/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -50,6 +50,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/lftp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/lftp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -50,6 +50,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/libarchive/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libarchive/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libassuan/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libassuan/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -65,6 +65,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libconfuse/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libconfuse/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libdnet/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libdnet/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -58,6 +58,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libedit/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libedit/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libee/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libee/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libestr/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libestr/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libevent/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libevent/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -58,6 +58,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libexpat/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libexpat/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libidn/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libidn/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -117,6 +117,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libksba/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libksba/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -65,6 +65,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libmcrypt/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libmcrypt/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -71,6 +71,8 @@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libmemcached/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libmemcached/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -79,6 +79,8 @@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libmng/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libmng/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -100,6 +100,8 @@
/bin/sed -e "s#MACH64#$(MACH64)#g" <$< >$@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64) $(BUILD_DIR)/libmng-64.pc
--- a/components/libneon/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libneon/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -66,6 +66,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libnet/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libnet/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libpcap/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libpcap/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/librsync/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/librsync/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -68,6 +68,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libsigsegv/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libsigsegv/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -45,6 +45,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libsndfile/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libsndfile/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -48,6 +48,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libssh2/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libssh2/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -52,6 +52,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libtecla/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libtecla/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libtool/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libtool/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -107,6 +107,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libtorrent/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libtorrent/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -82,6 +82,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libxml2/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libxml2/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -115,6 +115,8 @@
(cd $(@D) ; gtar xf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1));
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/libxslt/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/libxslt/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -81,6 +81,8 @@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/lighttpd/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/lighttpd/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -72,6 +72,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/links/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/links/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/m4/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/m4/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -48,6 +48,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/mailman/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mailman/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/make/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/make/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -50,6 +50,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/mc/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mc/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -56,6 +56,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/memcached/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/memcached/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -67,6 +67,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/mlocate/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mlocate/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/mpc/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mpc/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
--- a/components/mpfr/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mpfr/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -126,6 +126,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/mutt/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mutt/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -64,6 +64,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/mysql-common/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/mysql-common/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -34,7 +34,7 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# nothing to download or build; just package
-download prep build install test:
+download prep configure build install test:
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/ncftp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ncftp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
include ../../make-rules/shared-targets.mk
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ncurses/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ncurses/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -75,6 +75,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/net-snmp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/net-snmp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -126,6 +126,8 @@
cd $(BUILD_DIR)/$(MACH64)/sun ; ls agent; $(CCSMAKE) -e $(CCSMAKE_ARGS) install)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64) $(BUILD_DIR_32)/.docs
$(INSTALL_64): COMPONENT_INSTALL_ARGS += DESTDIR=$(BUILD_DIR)/prototype/$(MACH64)
--- a/components/nmap/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/nmap/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -75,6 +75,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ntp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ntp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -67,6 +67,8 @@
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
test: $(NO_TESTS)
--- a/components/ocaml/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ocaml/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -154,6 +154,8 @@
PKG_PROTO_DIRS += $(BUILD_DIR_$(BITS))
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/open-fabrics/ibutils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/ibutils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -94,6 +94,8 @@
$(RM) -r $(CLEANUP_DIRS)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/open-fabrics/infiniband-diags/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/infiniband-diags/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -79,6 +79,8 @@
$(INSTALL) -m 644 manpages/set_nodedesc.sh.1m $(PROTOMAN)/man1m
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32) $(PROTOMAN1MFILES)
--- a/components/open-fabrics/libibmad/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/libibmad/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -41,6 +41,8 @@
$(RM) $(PROTO_DIR)/$(CONFIGURE_LIBDIR.64)/$(COMPONENT_NAME).la;\
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/libibumad/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/libibumad/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -77,6 +77,8 @@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/libibverbs/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/libibverbs/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -77,6 +77,8 @@
$(PROTO_DIR)/$(CONFIGURE_MANDIR)/man3/ibv_modify_xrc_rcv_qp.3
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64) $(PROTOMAN3FILES)
--- a/components/open-fabrics/libmlx4/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/libmlx4/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -60,6 +60,8 @@
$(RM) $(PROTO_DIR)/$(CONFIGURE_LIBDIR.64)/$(COMPONENT_NAME).la;\
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/librdmacm/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/librdmacm/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -61,6 +61,8 @@
#COMPONENT_PRE_CONFIGURE_ACTION
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/libsdp/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/libsdp/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -62,6 +62,8 @@
$(RM) $(CLEANUP_DIRS)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/opensm/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/opensm/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -71,6 +71,8 @@
$(PROTO_DIR)/$(CONFIGURE_LIBDIR.64)/libibverbs.la
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/perftest/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/perftest/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -72,6 +72,8 @@
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64) $(PROTOMAN1FILES)
--- a/components/open-fabrics/qperf/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/qperf/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -43,6 +43,8 @@
ln -s $(SOURCE_DIR)/src/mkhelp ; ln -s $(SOURCE_DIR)/src/mkman)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/open-fabrics/rds-tools/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/open-fabrics/rds-tools/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -58,6 +58,8 @@
COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/openexr/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openexr/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -62,6 +62,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/openldap/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openldap/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -98,6 +98,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
(cd $(BUILD_DIR_32)/doc/guide/admin; \
$(PERL) -I$(SDFBLIB)/lib $(SDFBLIB)/script/sdf -2html guide.sdf; \
--- a/components/openssh/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openssh/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -99,6 +99,8 @@
)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/openssl/openssl-1.0.1-fips-140/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openssl/openssl-1.0.1-fips-140/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -174,6 +174,8 @@
$(SOURCE_DIR)/.prep: $(COMPONENT_DIR)/../openssl-fips/build/$(MACH32)/.installed \
$(COMPONENT_DIR)/../openssl-fips/build/$(MACH64)/.installed
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
# We follow what we do for install in openssl/openssl-1.0.0 component. Please
--- a/components/openssl/openssl-1.0.1/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openssl/openssl-1.0.1/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -192,6 +192,8 @@
BUILD_64 += $(BUILD_DIR_WANBOOT)/.built
endif
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
# Object files for wanboot-openssl.o have to be listed explicitly.
--- a/components/openssl/openssl-fips/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openssl/openssl-fips/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -106,6 +106,8 @@
# You should not use this target with this component unless testing or
# debugging. The OpenSSL FIPS-140 policy is strict and full U2 command set
# should be run. See above for more information.
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
# We must make the "install" target a no-op (but must run it to be compliant).
--- a/components/openusb/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/openusb/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -53,6 +53,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/pam_pkcs11/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pam_pkcs11/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -45,6 +45,8 @@
CONFIGURE_OPTIONS += OPENSSL_LIBS="-lssl -lcrypto -lsocket -lnsl"
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/parallel/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/parallel/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/patch/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/patch/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/pconsole/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pconsole/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -61,6 +61,8 @@
COMPONENT_INSTALL_ARGS += prefix=$(PROTOUSRDIR)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/pcre/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pcre/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -115,6 +115,8 @@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/perl/perl516/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/perl/perl516/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -130,6 +130,8 @@
# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/perl512/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/perl512/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -135,6 +135,8 @@
INSTALL_32 = $(VARIANTS:%=%/.installed)
TEST_32 = $(VARIANTS:%=%/.tested)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/php-5_2/php-cgi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-5_2/php-cgi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -55,6 +55,8 @@
COMPONENT_INSTALL_TARGETS = install-sapi
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/php-5_2/php-nsapi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-5_2/php-nsapi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -131,6 +131,8 @@
CLEAN_PATHS += webserver7-spi phpize-proto.zts php.ini
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/php-5_2/php-sapi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-5_2/php-sapi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -217,6 +217,8 @@
CLEAN_PATHS += php.ini-patched
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32) PHP-NSAPI_INSTALL PHP-CGI_INSTALL
--- a/components/php-5_3/php-cgi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-5_3/php-cgi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
COMPONENT_INSTALL_TARGETS = install-sapi
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/php-5_3/php-nsapi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-5_3/php-nsapi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -134,6 +134,8 @@
CLEAN_PATHS += webserver7-spi phpize-proto.zts php.ini
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/php-5_3/php-sapi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-5_3/php-sapi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -236,6 +236,8 @@
CLEAN_PATHS += php.ini-patched
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32) PHP-NSAPI_INSTALL PHP-CGI_INSTALL
--- a/components/php-common/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/php-common/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -37,7 +37,7 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# nothing to download or build; just package
-download prep build install test:
+download prep configure build install test:
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/pinentry/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pinentry/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -83,6 +83,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/pkg-config/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pkg-config/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/popt/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/popt/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -66,6 +66,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/privoxy/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/privoxy/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -59,6 +59,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/proftpd/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/proftpd/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -100,6 +100,8 @@
# attributes.
LICENSE_TRANSFORMS =
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/pv/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pv/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/pwgen/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/pwgen/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -68,6 +68,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/python/python26/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/python/python26/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -119,6 +119,8 @@
# common targets
$(INSTALL_32): $(INSTALL_64)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/python/python27/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/python/python27/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -124,6 +124,8 @@
# common targets
$(INSTALL_32): $(INSTALL_64)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/python/python34/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/python/python34/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -123,6 +123,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/quagga/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/quagga/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -81,6 +81,8 @@
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
test: $(NO_TESTS)
--- a/components/quilt/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/quilt/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -76,6 +76,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/readline/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/readline/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -56,6 +56,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/rsync/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/rsync/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/rsyslog/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/rsyslog/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -57,6 +57,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/rtorrent/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/rtorrent/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -74,6 +74,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/ruby/ruby-19/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ruby/ruby-19/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -151,6 +151,8 @@
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: build $(INSTALL_64)
--- a/components/ruby/ruby-common/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/ruby/ruby-common/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -36,7 +36,7 @@
LICENSE_TRANSFORMS=
# nothing to download or build; just publish the package
-download prep build install test:
+download prep configure build install test:
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- a/components/samba/mozldap/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/samba/mozldap/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -71,6 +71,8 @@
( cd $(SOURCE_DIR)/$(SRC_OFFSET) ; autoconf -f )
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
include ../../../make-rules/shared-targets.mk
--- a/components/samba/samba/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/samba/samba/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -222,6 +222,8 @@
$(INSTALL_64): COMPONENT_INSTALL_TARGETS = showlayout installpammodules
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
include ../../../make-rules/shared-targets.mk
--- a/components/samba/samba30/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/samba/samba30/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -141,6 +141,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
include ../../../make-rules/shared-targets.mk
--- a/components/sane-backends/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/sane-backends/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -42,6 +42,8 @@
CONFIGURE_OPTIONS += --sysconfdir=/etc
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/sane-frontends/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/sane-frontends/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -45,6 +45,8 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS += LDFLAGS="-lsane"
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/screen/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/screen/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/sed/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/sed/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -48,6 +48,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/sg3_utils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/sg3_utils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -62,6 +62,8 @@
PKG_PROTO_DIRS += $(COMPONENT_DIR)/files
# common targets
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/slang/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/slang/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/slrn/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/slrn/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -59,6 +59,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/smp_utils/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/smp_utils/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -106,6 +106,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/snort/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/snort/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -75,6 +75,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/sox/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/sox/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/spawn-fcgi/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/spawn-fcgi/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -46,6 +46,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/squid/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/squid/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -104,6 +104,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/stdcxx/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/stdcxx/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -248,7 +248,9 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-build: $(BUILD_32) $(BUILD_64)
+configure: $(CONFIGURE_32_and_64)
+
+build: $(BUILD_32_and_64)
install: $(BUILD_DIR_32)/.built $(BUILD_DIR_64)/.built
$(CP) $(COMPONENT_DIR)/Solaris/install.sh $(COMPONENT_DIR)/
--- a/components/stunnel/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/stunnel/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
@@ -69,6 +69,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/subversion/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/subversion/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -160,6 +160,8 @@
ASLR_MODE=$(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/sudo/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/sudo/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -94,6 +94,8 @@
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/swig/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/swig/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -51,6 +51,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/tcl/expect/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tcl/expect/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -62,6 +62,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/tcl/tcl/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tcl/tcl/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -67,6 +67,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64) $(PROTOUSRLIBDIR)/tclConfig.sh
--- a/components/tcl/tk/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tcl/tk/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -66,6 +66,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64) $(PROTOUSRLIBDIR)/tkConfig.sh
--- a/components/tcltls/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tcltls/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -53,6 +53,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/tcpdump/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tcpdump/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/tcsh/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tcsh/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -65,6 +65,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/texinfo/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/texinfo/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -54,6 +54,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/text-utilities/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/text-utilities/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -93,6 +93,8 @@
COMPONENT_TEST_TARGETS = colrm column hexdump tailf
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/tidy/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tidy/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -66,6 +66,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64) $(PROTODOCDIR)
--- a/components/tmux/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/tmux/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -55,6 +55,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/top/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/top/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -48,6 +48,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/trousers/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/trousers/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -88,6 +88,8 @@
COMPONENT_BUILD_TARGETS = all
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/unixodbc/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/unixodbc/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -104,6 +104,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/vim/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/vim/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -137,6 +137,8 @@
nawk '/begin of license/ {p=1; getline; next} /end of license/ {p=0} p == 1 {print}' $< > $@
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64) $(X_VARIANT)/.built $(BUILD_DIR)/license
--- a/components/wdiff/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/wdiff/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -47,6 +47,8 @@
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/webalizer/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/webalizer/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -68,6 +68,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/wget/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/wget/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -69,6 +69,8 @@
# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/which/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/which/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -49,6 +49,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/wireshark/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/wireshark/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -77,6 +77,8 @@
chmod 755 config.status; \
./config.status)
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/wxwidgets/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/wxwidgets/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -79,6 +79,8 @@
$(TOUCH) $@
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64) \
$(BUILD_DIR_32)/contrib/.built \
$(BUILD_DIR_64)/contrib/.built
--- a/components/xmlto/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/xmlto/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -52,6 +52,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64)
install: $(INSTALL_64)
--- a/components/xorriso/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/xorriso/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -50,6 +50,8 @@
COMPONENT_PREP_ACTION = \
(cd $(@D) ; test -f config.status && rm config.status)
+configure: $(CONFIGURE_32)
+
build: $(BUILD_32)
install: $(INSTALL_32)
--- a/components/xz/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/xz/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -43,6 +43,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
include ../../make-rules/shared-targets.mk
--- a/components/zlib/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/zlib/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -106,6 +106,8 @@
COMPONENT_TEST_TARGETS = test
+configure: $(CONFIGURE_32_and_64)
+
build: $(BUILD_32_and_64)
install: $(INSTALL_32_and_64)
--- a/components/zsh/Makefile Fri Nov 21 10:49:36 2014 -0800
+++ b/components/zsh/Makefile Fri Nov 21 16:37:26 2014 -0800
@@ -101,6 +101,8 @@
ASLR_MODE = $(ASLR_ENABLE)
# common targets
+configure: $(CONFIGURE_64)
+
build: $(BUILD_64) $(COMPOVERRIDES:%=$(COMPONENT_SRC)/%)
install: build $(INSTALL_64) $(PROTOETCDIR)/zprofile $(PROTOETCDIR)/zshrc license