From owner-svn-ports-head@FreeBSD.ORG Mon Aug 26 13:48:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D91917F3; Mon, 26 Aug 2013 13:48:01 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC85D2562; Mon, 26 Aug 2013 13:48:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7QDm1DJ085816; Mon, 26 Aug 2013 13:48:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7QDm1ur085815; Mon, 26 Aug 2013 13:48:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201308261348.r7QDm1ur085815@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 26 Aug 2013 13:48:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325397 - head/java/eclipse/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Aug 2013 13:48:01 -0000 Author: bapt Date: Mon Aug 26 13:48:01 2013 New Revision: 325397 URL: http://svnweb.freebsd.org/changeset/ports/325397 Log: Do not hard code gcc but rather use cc, which allows building without gcc in base Modified: head/java/eclipse/files/freebsd-support.patch Modified: head/java/eclipse/files/freebsd-support.patch ============================================================================== --- head/java/eclipse/files/freebsd-support.patch Mon Aug 26 13:28:50 2013 (r325396) +++ head/java/eclipse/files/freebsd-support.patch Mon Aug 26 13:48:01 2013 (r325397) @@ -100,7 +100,7 @@ $FreeBSD$ +endif + +# Define the object modules to be compiled and flags. -+CC=gcc ++CC=cc +MAIN_OBJS = eclipseMain.o +COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseGtkCommon.o eclipseGtkInit.o +DLL_OBJS = eclipse.o eclipseGtk.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o eclipseShm.o eclipseNix.o @@ -333,8 +333,8 @@ $FreeBSD$ +OPT_FLAGS=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + +core : -+ gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C) -+ gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc ++ cc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C) ++ cc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc + +clean : + rm *.o @@ -619,15 +619,15 @@ $FreeBSD$ + +compile: + @echo "Building file: $(GNOMEPROXY.O)" -+ @echo "Invoking: GCC C Compiler" -+ gcc $(INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) ++ @echo "Invoking: C Compiler" ++ cc $(INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) + @echo "Finished building: $(GNOMEPROXY.O)" + @echo " " + +link: compile + @echo "Building target: $(LIB_NAME_FULL)" -+ @echo "Invoking: GCC C Linker" -+ gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc ++ @echo "Invoking: C Linker" ++ cc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc + @echo "Finished building target: $(LIB_NAME_FULL)" + @echo " " + @@ -7004,9 +7004,9 @@ $FreeBSD$ + + + -+ ++ + -+ ++ + + +