16991973 some things ain't parfait'n
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 12 Jul 2013 14:16:05 -0700
changeset 1394 5f86498eee95
parent 1393 300d3de848bb
child 1395 98558b352a2c
16991973 some things ain't parfait'n
components/apache2-modules/mod_dtrace/Makefile
components/apache2-modules/mod_fcgid/Makefile
components/apache2-modules/mod_jk/Makefile
components/apache2-modules/mod_perl/Makefile
components/apache2-modules/mod_proxy_html/Makefile
components/apache2-modules/mod_wsgi/Makefile
components/cdrtools/Makefile
components/doxygen/Makefile
components/getopt/Makefile
components/libusb/ugen/src/Makefile
components/libusb/wrapper/src/Makefile
components/open-fabrics/ofed.mk
components/openssl/openssl-1.0.1/Makefile
components/p7zip/Makefile
make-rules/shared-macros.mk
tools/Makefile
--- a/components/apache2-modules/mod_dtrace/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/apache2-modules/mod_dtrace/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -39,6 +39,9 @@
 $(BUILD_DIR_64)/.built:	COMPONENT_BUILD_ARGS +=	DTRACE="/usr/sbin/dtrace -64"
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 download:
 
--- a/components/apache2-modules/mod_fcgid/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/apache2-modules/mod_fcgid/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -46,6 +46,9 @@
 COMPONENT_PRE_BUILD_ACTION= ( cd $(@D); APXS=$(APXS) ./configure.apxs )
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 build: $(BUILD_32_and_64)
 
--- a/components/apache2-modules/mod_jk/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/apache2-modules/mod_jk/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -54,6 +54,9 @@
 COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR)/native $(@D));
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 build: $(BUILD_32_and_64)
 
--- a/components/apache2-modules/mod_perl/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/apache2-modules/mod_perl/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -60,6 +60,9 @@
 COMPONENT_TEST_TARGETS=	test
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 build: $(BUILD_32)
 
--- a/components/apache2-modules/mod_proxy_html/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -45,6 +45,9 @@
 $(BUILD_DIR_64)/.built: COMPONENT_BUILD_ARGS +=	APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 build: $(BUILD_32_and_64)
 
--- a/components/apache2-modules/mod_wsgi/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -20,12 +20,15 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 COMPONENT_NAME=		mod_wsgi
 COMPONENT_VERSION=	3.3
--- a/components/cdrtools/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/cdrtools/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,8 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         cdrtools
@@ -30,8 +31,12 @@
 COMPONENT_ARCHIVE_HASH=	\
     sha256:6326762da8b8281c9a910c66fe698cd4d1bc5f33c37b59e8f1c83343c25f3e98
 COMPONENT_ARCHIVE_URL=  ftp://ftp.berlios.de/pub/cdrecord/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/cdrtools
+
 PATH=			$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
-COMPONENT_BUGDB=	utility/cdrtools
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
@@ -39,6 +44,11 @@
 
 COMPONENT_INSTALL_ARGS +=  GMAKE_NOWARN=true
 COMPONENT_BUILD_ARGS += GMAKE_NOWARN=true
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+COMPONENT_BUILD_ENV +=	"ac_cv_exeext=no"
+COMPONENT_BUILD_ENV +=	"ac_cv_objext=o"
+endif
+
 
 build:          $(BUILD_32)
 
--- a/components/doxygen/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/doxygen/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -44,6 +44,10 @@
 
 # Necessary to find CC during build
 PATH=$(SPRO_VROOT)/bin:/usr/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
+
 
 # Missing files in build dir for configure without this.
 COMPONENT_PRE_CONFIGURE_ACTION =	($(CLONEY) $(SOURCE_DIR) $(@D))
--- a/components/getopt/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/getopt/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -40,13 +40,14 @@
 include ../../make-rules/ips.mk
 
 # getopt doesn't use configure, override the hard-wired values in the Makefile.
-COMPONENT_BUILD_ARGS+=	CC="$(SPRO_VROOT)/bin/cc $(CC_BITS)"
+CC += "$(CC_BITS)"
+COMPONENT_BUILD_ARGS+=	CC="$(CC)"
 COMPONENT_BUILD_ARGS+=	CFLAGS="$(CFLAGS)"
 COMPONENT_BUILD_ARGS+=	LIBCGETOPT=0
 
 COMPONENT_INSTALL_ARGS+=	prefix=/usr/gnu
 COMPONENT_INSTALL_ARGS+=	mandir=/usr/gnu/share/man
-COMPONENT_INSTALL_ARGS+=	CC="$(SPRO_VROOT)/bin/cc $(CC_BITS)"
+COMPONENT_INSTALL_ARGS+=	CC="$(CC)"
 COMPONENT_INSTALL_ARGS+=	CFLAGS="$(CFLAGS)"
 
 # Stupid source tarball distribution contains two .o files.
--- a/components/libusb/ugen/src/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/libusb/ugen/src/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,12 +18,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
+
+LIBNAME =	libusbugen.so.1
+
+all:	$(LIBNAME)
+
 include ../../../../../make-rules/shared-macros.mk
 
-LIBNAME =	libusbugen.so.1
 SRCS =		libusbugen.c
 OBJS =		$(SRCS:%.c=%.o)
 
@@ -35,8 +39,6 @@
 LDFLAGS +=	$(MAPFILES:%=-M %)
 LIBS +=		-ldl -lc
 
-all:	$(LIBNAME)
-
 $(LIBNAME):	$(OBJS)
 	$(LD) $(LDFLAGS) -G -h [email protected] -o [email protected] $(OBJS) $(LIBS)
 
--- a/components/libusb/wrapper/src/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/libusb/wrapper/src/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -18,16 +18,19 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
+LIBNAME =	libusb.so.1
+
+all:	$(LIBNAME)
+
 include ../../../../../make-rules/shared-macros.mk
 
 incdir =	/usr/include
 libdir =	/usr/lib
 docdir =	/usr/share/doc/libusb
 
-LIBNAME =	libusb.so.1
 SRCS =		wr_libusb.c
 OBJS =		$(SRCS:%.c=%.o)
 
@@ -41,8 +44,6 @@
 LDFLAGS +=	$(MAPFILES:%=-M %)
 LIBS +=		-ldl -lc
 
-all:	$(LIBNAME)
-
 $(LIBNAME):	$(OBJS)
 	$(LD) $(LDFLAGS) -G -h [email protected] -o [email protected] $(OBJS) $(LIBS)
 
--- a/components/open-fabrics/ofed.mk	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/open-fabrics/ofed.mk	Fri Jul 12 14:16:05 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Since we are building these as a set and not packaging them individually at
@@ -30,6 +30,10 @@
 COMPILER=gcc
 
 PATH=/usr/sfw/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):/usr/sfw/bin:/usr/bin
+endif
+
 
 CPPFLAGS += "-Wformat=2"
 CFLAGS += -D_REENTRANT
--- a/components/openssl/openssl-1.0.1/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/openssl/openssl-1.0.1/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -50,6 +50,9 @@
 include $(WS_TOP)/make-rules/lint-libraries.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/perl5/bin
+endif
 
 # Variant of OpenSSL for wanboot is built in build/sparcv9-wanboot.
 BUILD_DIR_WANBOOT = $(BUILD_DIR)/$(MACH64)-wanboot
--- a/components/p7zip/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/components/p7zip/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -26,6 +26,9 @@
 include ../../make-rules/shared-macros.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
+endif
 
 COMPONENT_NAME=		p7zip
 COMPONENT_VERSION=	9.20.1
--- a/make-rules/shared-macros.mk	Fri Jul 12 09:55:54 2013 -0700
+++ b/make-rules/shared-macros.mk	Fri Jul 12 14:16:05 2013 -0700
@@ -225,7 +225,8 @@
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT =	$(SPRO_ROOT)/sunstudio12.1
 
-PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.1
+PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.2
+PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
 export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
 export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
@@ -264,15 +265,15 @@
 PYTHON.2.7.VENDOR_PACKAGES = $(PYTHON.2.7.VENDOR_PACKAGES.$(BITS))
 
 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-CC.studio.32 =	$(WS_TOOLS)/parfait/cc
-CXX.studio.32 =	$(WS_TOOLS)/parfait/CC
-CC.studio.64 =	$(WS_TOOLS)/parfait/cc
-CXX.studio.64 =	$(WS_TOOLS)/parfait/CC
-CC.gcc.32 =	$(WS_TOOLS)/parfait/gcc
-CXX.gcc.32 =	$(WS_TOOLS)/parfait/g++
-CC.gcc.64 =	$(WS_TOOLS)/parfait/gcc
-CXX.gcc.64 =	$(WS_TOOLS)/parfait/g++
-LD =		$(WS_TOOLS)/parfait/ld
+CC.studio.32 =	$(PARFAIT_TOOLS)/cc
+CXX.studio.32 =	$(PARFAIT_TOOLS)/CC
+CC.studio.64 =	$(PARFAIT_TOOLS)/cc
+CXX.studio.64 =	$(PARFAIT_TOOLS)/CC
+CC.gcc.32 =	$(PARFAIT_TOOLS)/gcc
+CXX.gcc.32 =	$(PARFAIT_TOOLS)/g++
+CC.gcc.64 =	$(PARFAIT_TOOLS)/gcc
+CXX.gcc.64 =	$(PARFAIT_TOOLS)/g++
+LD =		$(PARFAIT_TOOLS)/ld
 endif
 
 CC =		$(CC.$(COMPILER).$(BITS))
--- a/tools/Makefile	Fri Jul 12 09:55:54 2013 -0700
+++ b/tools/Makefile	Fri Jul 12 14:16:05 2013 -0700
@@ -31,19 +31,19 @@
 # some things reset the environment which causes lovely infinite
 # loops
 links:
-	@$(MKDIR) parfait
+	@$(MKDIR) $(PARFAIT_TOOLS)
 	@for i in cc CC gcc g++ ld ; do \
-		$(MKDIR) parfait ; \
-		$(RM) parfait/$$i ; \
-		echo "#!/bin/ksh" > parfait/$$i ; \
-		echo "IFS=" >> parfait/$$i ; \
-		echo "export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc" >> parfait/$$i ; \
-		echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> parfait/$$i ; \
-		echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> parfait/$$i ; \
-		echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> parfait/$$i ; \
-		echo "export PARFAIT_NATIVELD=/usr/bin/ld" >> parfait/$$i ; \
-		echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> parfait/$$i ; \
-		chmod +x parfait/$$i ; \
+		$(MKDIR) $(PARFAIT_TOOLS) ; \
+		$(RM) $(PARFAIT_TOOLS)/$$i ; \
+		echo "#!/bin/ksh" > $(PARFAIT_TOOLS)/$$i ; \
+		echo "IFS=" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "export PARFAIT_NATIVELD=/usr/bin/ld" >> $(PARFAIT_TOOLS)/$$i ; \
+		echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
+		chmod +x $(PARFAIT_TOOLS)/$$i ; \
 	done
 
 pkglint:
@@ -69,5 +69,5 @@
 
 clobber:	clean
 	@$(RM) time-*.so python/pkglint/*.pyc
-	@$(RM) -r parfait
+	@$(RM) -r $(PARFAIT_TOOLS)