Date: Thu, 13 Oct 2011 22:28:29 +0000 From: Nali Toja <nalitoja@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/161561: [patch] games/el: actually respect CC Message-ID: <861uugo7aq.fsf@gmail.com> Resent-Message-ID: <201110132230.p9DMU7ro080113@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161561
>Category: ports
>Synopsis: [patch] games/el: actually respect CC
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 13 22:30:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Nali Toja
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
# slightly different from pointyhat
$ export PATH=~/.bin:$PATH
$ for cc in CC cc c++ gcc g++; do ln -s /usr/bin/false ~/.bin/${cc}; done
>Description:
CC/CXX/LINK are unconditionally defined in WRKSRC/make.conf that is
included in Makefile.linux. And there is no need to define CC/CXX
as they're part of default_variables[] in gmake(1)
$ printf 'all:\n\tCC=$(CC)\n\tCXX=$(CXX)\n' | env -i gmake -f -
CC=cc
CXX=g++
>How-To-Repeat:
http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/e.9-exp.20110723205754/el-180_6.log
remove `@' from commands to see that build invokes `gcc'
>Fix:
--- cc.diff begins here ---
Index: games/el/files/patch-Makefile.linux
===================================================================
RCS file: /a/.csup/ports/games/el/files/patch-Makefile.linux,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile.linux
--- games/el/files/patch-Makefile.linux 20 Jan 2009 17:29:36 -0000 1.2
+++ games/el/files/patch-Makefile.linux 13 Oct 2011 21:34:41 -0000
@@ -25,7 +25,7 @@
$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
_LDFLAGS=$(XDIR) -lGL -lpthread -lz
STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a libs/libpng.a libs/libasound.a $(EXTRA_STATICLIBS)
-@@ -75,16 +77,16 @@
+@@ -75,7 +77,7 @@ HEADER_DIRS = . books eye_candy io pawn
DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P))
#(shell echo $OBJ |sed s/\.o/\.P/))
@@ -33,16 +33,13 @@
+EXE=el.x86
ifndef CC
--CC=gcc
-+CC?=gcc
- endif
- ifndef CXX
--CXX=g++
-+CXX?=g++
+ CC=gcc
+@@ -84,7 +86,7 @@ ifndef CXX
+ CXX=g++
endif
ifndef LINK
-LINK=gcc
-+LINK?=gcc
++LINK?=$(CC)
endif
# the compile targets
Index: games/el/files/patch-make.defaults
===================================================================
RCS file: games/el/files/patch-make.defaults
diff -N games/el/files/patch-make.defaults
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ games/el/files/patch-make.defaults 13 Oct 2011 21:26:07 -0000
@@ -0,0 +1,10 @@
+--- make.defaults~
++++ make.defaults
+@@ -89,7 +89,3 @@ CXXWARN=-Wall
+ #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
+ #EXTRA_LIBS=-lz
+ #EXTRA_STATICLIBS=libs/zlib.a
+-
+-CC=gcc
+-CXX=g++
+-LINK=gcc
--- cc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?861uugo7aq.fsf>