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.
22541052 aspell, cppunit, openusb, and re2c shouldn't override gcc version
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Wed, 13 Jan 2016 10:15:11 -0600
changeset 5343 48c162cab8f5
parent 5342 e55d87e99ecd
child 5344 61c6ac904750
22541052 aspell, cppunit, openusb, and re2c shouldn't override gcc version
components/aspell/Makefile file | annotate | diff | comparison | revisions
components/cppunit/Makefile file | annotate | diff | comparison | revisions
components/openusb/Makefile file | annotate | diff | comparison | revisions
components/re2c/Makefile file | annotate | diff | comparison | revisions 
--- a/components/aspell/Makefile	Tue Jan 26 12:01:07 2016 -0600
+++ b/components/aspell/Makefile	Wed Jan 13 10:15:11 2016 -0600
@@ -18,8 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER =		gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		aspell
@@ -48,9 +50,6 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-COMPILER =		gcc
-GCC_ROOT =		/usr/gcc/4.8
-
 ASPELL_BIN_DIR.32 =	$(PROTOUSRBINDIR)
 ASPELL_BIN_DIR.64 =	$(PROTOUSRBINDIR64)
 ASPELL_BIN_DIR =	$(ASPELL_BIN_DIR.$(BITS))
@@ -78,7 +77,6 @@
 CXX +=			$(CC_BITS)
 CC +=			$(CC_BITS)
 
-LD_OPTIONS +=		-lm
 CONFIGURE_ENV +=	LD_OPTIONS="$(LD_OPTIONS)"
 
 CLEAN_PATHS +=		$(SOURCE_DIR_1)
--- a/components/cppunit/Makefile	Tue Jan 26 12:01:07 2016 -0600
+++ b/components/cppunit/Makefile	Wed Jan 13 10:15:11 2016 -0600
@@ -18,8 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER=gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cppunit
@@ -39,8 +41,6 @@
 include $(WS_MAKE_RULES)/ips.mk
 
 
-COMPILER=gcc
-GCC_ROOT=/usr/gcc/4.8
 export PATH=$(GCC_ROOT)/bin:/usr/gnu/bin:/usr/bin
 
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
--- a/components/openusb/Makefile	Tue Jan 26 12:01:07 2016 -0600
+++ b/components/openusb/Makefile	Wed Jan 13 10:15:11 2016 -0600
@@ -18,8 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER =	gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openusb
@@ -44,8 +46,6 @@
 COMPONENT_PRE_CONFIGURE_ACTION = \
         ($(CLONEY) $(SOURCE_DIR) $(@D))
 
-COMPILER =	gcc
-
 PATCH_LEVEL = 1
 
 COMPONENT_POST_BUILD_ACTION = \
--- a/components/re2c/Makefile	Tue Jan 26 12:01:07 2016 -0600
+++ b/components/re2c/Makefile	Wed Jan 13 10:15:11 2016 -0600
@@ -18,8 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER =		gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		re2c
@@ -38,9 +40,6 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-COMPILER =		gcc
-GCC_ROOT =		/usr/gcc/4.8
-
 export PATH=$(GCC_ROOT)/bin:/usr/gnu/bin:/usr/bin
 
 # Needed to get the tests to run successfully.
upstream/oracle/userland-gate