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.
23175936 lp64 status regression for some components
authorShawn Walker-Salas <shawn.walker@oracle.com>
Mon, 25 Apr 2016 12:33:41 -0700
changeset 5843 9cefd39b551b
parent 5842 292637cfef88
child 5844 ba7883e92c55
23175936 lp64 status regression for some components
components/fastcgi/Makefile file | annotate | diff | comparison | revisions
components/getopt/Makefile file | annotate | diff | comparison | revisions
components/git/Makefile file | annotate | diff | comparison | revisions
components/lua/Makefile file | annotate | diff | comparison | revisions
components/sane-frontends/Makefile file | annotate | diff | comparison | revisions 
--- a/components/fastcgi/Makefile	Mon Apr 25 08:26:37 2016 -0700
+++ b/components/fastcgi/Makefile	Mon Apr 25 12:33:41 2016 -0700
@@ -22,8 +22,7 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-# Prefer 32-bit as default fastcgi target matters.
-BUILD_BITS= 32_and_64
+BUILD_BITS= 64_and_32
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		fastcgi
@@ -44,6 +43,11 @@
 # https://www.gnu.org/software/libtool/manual/html_node/Stripped-link-flags.html
 LDFLAGS +=	-Wc,$(studio_NORUNPATH)
 
+# For now, install 32-bit and 64-bit binaries to the same location.  This will
+# cause problems if we ever install 32-bit and 64-bit concurrently.  This is
+# likely the safest option until we can either stop shipping 32-bit or until it
+# can be verified that the bindir path does not matter.
+CONFIGURE_BINDIR.32= $(USRBINDIR)
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --with-pic
 CONFIGURE_OPTIONS += --includedir=$(CONFIGURE_INCLUDEDIR)/fastcgi
--- a/components/getopt/Makefile	Mon Apr 25 08:26:37 2016 -0700
+++ b/components/getopt/Makefile	Mon Apr 25 12:33:41 2016 -0700
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		getopt
@@ -39,6 +40,7 @@
 include $(WS_MAKE_RULES)/common.mk
 
 # getopt doesn't use configure, override the hard-wired values in the Makefile.
+LDFLAGS += $(CC_BITS)
 COMPONENT_BUILD_ARGS+=	CC="$(CC)"
 COMPONENT_BUILD_ARGS+=	CFLAGS="$(CFLAGS)"
 COMPONENT_BUILD_ARGS+=	LDFLAGS="$(LDFLAGS)"
--- a/components/git/Makefile	Mon Apr 25 08:26:37 2016 -0700
+++ b/components/git/Makefile	Mon Apr 25 12:33:41 2016 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		git
--- a/components/lua/Makefile	Mon Apr 25 08:26:37 2016 -0700
+++ b/components/lua/Makefile	Mon Apr 25 12:33:41 2016 -0700
@@ -56,8 +56,8 @@
 COMPONENT_BUILD_ARGS += USRCFLAGS="$(CFLAGS)"
 COMPONENT_INSTALL_ARGS += INSTALL=$(INSTALL)
 COMPONENT_INSTALL_ARGS += INSTALL_TOP=$(PROTOUSRDIR)
+$(INSTALL_32):	COMPONENT_INSTALL_ARGS += INSTALL_BIN=$(PROTOUSRBINDIR)/$(MACH32)
 $(INSTALL_64):	COMPONENT_INSTALL_ARGS += INSTALL_LIB=$(PROTOUSRLIBDIR64)
-$(INSTALL_64):	COMPONENT_INSTALL_ARGS += INSTALL_BIN=$(PROTOUSRBINDIR64)
 
 $(BUILD_DIR)/lua-64.pc:		files/lua-64.pc
 	$(GSED) -e "s#MACH64#$(MACH64)#g" < $< > $@
--- a/components/sane-frontends/Makefile	Mon Apr 25 08:26:37 2016 -0700
+++ b/components/sane-frontends/Makefile	Mon Apr 25 12:33:41 2016 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-BUILD_BITS= 32
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		sane-frontends
@@ -38,7 +38,7 @@
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
-LDFLAGS += -lsane
+LDFLAGS += -lsane $(CC_BITS)
 
 CONFIGURE_OPTIONS +=	--with-sane-prefix=$(USRDIR)
 CONFIGURE_OPTIONS +=	--disable-sanetest
upstream/oracle/userland-gate