Date: Sat, 25 Dec 2010 10:00:27 GMT From: Anonymous <swell.k@gmail.com> To: freebsd-java@FreeBSD.org Subject: Re: ports/151042: [patch] java/openjdk6 Respect CC Message-ID: <201012251000.oBPA0Rxh091875@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/151042; it has been noted by GNATS.
From: Anonymous <swell.k@gmail.com>
To: rfarmer@predatorlabs.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/151042: [patch] java/openjdk6 Respect CC
Date: Sat, 25 Dec 2010 12:55:20 +0300
- sys.mk already provides default values for CC/CPP/CXX (cc/cpp/c++)
- but the port may not support using cpp(1) directly, so don't inherit CPP
- and using absolute paths breaks devel/ccache usage
--- a.diff begins here ---
Index: java/openjdk6/files/patch-set
===================================================================
RCS file: /a/.cvsup/ports/java/openjdk6/files/patch-set,v
retrieving revision 1.10
diff -u -p -r1.10 patch-set
--- java/openjdk6/files/patch-set 13 Dec 2010 08:59:52 -0000 1.10
+++ java/openjdk6/files/patch-set 25 Dec 2010 09:37:51 -0000
@@ -203,15 +203,13 @@
# OPT build MUST have a mapfile?
--- corba/make/common/shared/Compiler-gcc.gmk 2010-06-21 14:11:20.000000000 -0700
+++ corba/make/common/shared/Compiler-gcc.gmk 2010-06-20 21:56:15.000000000 -0700
-@@ -100,6 +100,24 @@
+@@ -100,6 +100,22 @@
endif
+ifeq ($(PLATFORM), bsd)
+ # Settings specific to BSD
-+ CC = $(COMPILER_PATH)gcc
-+ CPP = $(COMPILER_PATH)gcc -E
-+ CXX = $(COMPILER_PATH)g++
++ CPP = $(CC) -E
+ REQUIRED_CC_VER = 3.3
+ REQUIRED_GCC_VER = 3.3.*
+
@@ -6725,16 +6723,14 @@
--- jdk/make/common/shared/Compiler-gcc.gmk 2010-06-21 14:15:08.000000000 -0700
+++ jdk/make/common/shared/Compiler-gcc.gmk 2010-06-20 21:56:16.000000000 -0700
-@@ -99,6 +99,24 @@
+@@ -99,6 +99,22 @@
endif
+ifeq ($(PLATFORM), bsd)
+
+ # Settings specific to BSD
-+ CC = $(COMPILER_PATH)gcc
-+ CPP = $(COMPILER_PATH)gcc -E
-+ CXX = $(COMPILER_PATH)g++
++ CPP = $(CC) -E
+ REQUIRED_CC_VER = 3.2
+
+ # Option used to create a shared library
--- a.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012251000.oBPA0Rxh091875>