Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7052372 lablgtk and unison can find the wrong compiler when building
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 07 Jun 2011 13:38:21 -0700
changeset 286 54ecf1775bd5
parent 285 6ce8a202e4f3
child 287 4679ead72494
7052372 lablgtk and unison can find the wrong compiler when building 7052415 bzip should force 32-bit install last
components/bzip2/Makefile file | annotate | diff | comparison | revisions
components/lablgtk/Makefile file | annotate | diff | comparison | revisions
components/unison/Makefile file | annotate | diff | comparison | revisions 
--- a/components/bzip2/Makefile	Thu May 12 14:41:22 2011 -0700
+++ b/components/bzip2/Makefile	Tue Jun 07 13:38:21 2011 -0700
@@ -52,12 +52,16 @@
 	    cp ../../oldapi.c . )
 
 # common targets
-build:		$(BUILD_32) $(BUILD_64)
+build:		$(BUILD_32_and_64)
 
-install:	build $(INSTALL_32)
+# override the 64 bit install and have it make a directory for the lint lib
+$(INSTALL_64):
+	$(MKDIR) $(PROTOUSRLIBDIR64)
+	touch $@
+
+install:	build $(INSTALL_32_and_64)
 	$(INSTALL) $(BUILD_DIR_32)/libbz2.so.1 $(PROTOUSRLIBDIR)
 	cd $(PROTOUSRLIBDIR); rm -f libbz2.so; ln -s libbz2.so.1 libbz2.so
-	$(MKDIR) $(PROTOUSRLIBDIR64)
 	$(INSTALL) $(BUILD_DIR_64)/libbz2.so.1 $(PROTOUSRLIBDIR64)
 	cd $(PROTOUSRLIBDIR64); rm -f libbz2.so; ln -s libbz2.so.1 libbz2.so
 	$(INSTALL) $(BUILD_DIR_64)/llib-lbz2.ln $(PROTOUSRLIBDIR64)
--- a/components/lablgtk/Makefile	Thu May 12 14:41:22 2011 -0700
+++ b/components/lablgtk/Makefile	Tue Jun 07 13:38:21 2011 -0700
@@ -25,6 +25,8 @@
 
 include ../../make-rules/shared-macros.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/gnu/bin:/usr/bin
+
 COMPONENT_NAME=		lablgtk
 COMPONENT_VERSION=	2.10.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
--- a/components/unison/Makefile	Thu May 12 14:41:22 2011 -0700
+++ b/components/unison/Makefile	Tue Jun 07 13:38:21 2011 -0700
@@ -25,6 +25,8 @@
 
 include ../../make-rules/shared-macros.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/gnu/bin:/usr/bin
+
 COMPONENT_NAME=		unison
 COMPONENT_VERSION=	2.27.57
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
upstream/oracle/userland-gate