Date: Thu, 1 Nov 2007 03:53:25 +0300 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117730: [PATCH] games/holotz-castle: unbreak with gcc42, respect CXX/CXXFLAGS, mark broken Message-ID: <20071101005325.963464336@hades.panopticon> Resent-Message-ID: <200711010100.lA1108lN067655@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117730
>Category: ports
>Synopsis: [PATCH] games/holotz-castle: unbreak with gcc42, respect CXX/CXXFLAGS, mark broken
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 01 01:00:08 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p20 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
* Unbreak build with gcc42 (remove -Werror)
* Respect CXX and CXXFLAGS
* Mark BROKEN again as it does not run :)
>How-To-Repeat:
>Fix:
--- holotz-castle.patch begins here ---
diff -ruN holotz-castle.orig/Makefile holotz-castle/Makefile
--- holotz-castle.orig/Makefile Thu Nov 1 03:51:25 2007
+++ holotz-castle/Makefile Thu Nov 1 03:51:14 2007
@@ -15,17 +15,13 @@
MAINTAINER= ppl@nbnet.nb.ca
COMMENT= A platform game with high doses of mystery
-MAKE_ARGS= HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/
+MAKE_ARGS= HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/ CXX=${CXX}
USE_GL= gl
USE_SDL= image mixer sdl ttf
USE_X_PREFIX= yes
USE_GMAKE= yes
-.include <bsd.port.pre.mk>
+BROKEN= Does not run (No video mode large enough for 676550817x676551540)
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN holotz-castle.orig/files/patch-all holotz-castle/files/patch-all
--- holotz-castle.orig/files/patch-all Thu Nov 1 03:51:25 2007
+++ holotz-castle/files/patch-all Thu Nov 1 03:51:14 2007
@@ -1,6 +1,6 @@
-diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp
---- JLib/JLib/Util/JFS.cpp Fri Jan 20 08:59:37 2006
-+++ holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp Mon Jan 23 21:21:36 2006
+diff -ruN JLib/JLib/Util/JFS.cpp JLib/JLib/Util/JFS.cpp
+--- JLib/JLib/Util/JFS.cpp 2007-11-01 02:27:55.000000000 +0000
++++ JLib/JLib/Util/JFS.cpp 2007-11-01 02:28:00.000000000 +0000
@@ -886,8 +886,8 @@
s32 n, k;
@@ -12,29 +12,67 @@
if (n < 0)
{
-diff -ru JLib/Makefile holotz-castle-1.3.8-src/JLib/Makefile
---- JLib/Makefile Fri Jan 20 08:59:37 2006
-+++ holotz-castle-1.3.8-src/JLib/Makefile Mon Jan 23 21:20:53 2006
+diff -ruN JLib/Makefile JLib/Makefile
+--- JLib/Makefile 2007-11-01 02:27:55.000000000 +0000
++++ JLib/Makefile 2007-11-01 02:29:12.000000000 +0000
@@ -19,7 +19,7 @@
endif
# Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
-+CFLAGS=-I$(X11BASE)/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
++CFLAGS+=-I$(LOCALBASE)/include -I. -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
# Sample LDFLAGS for applications
# LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
-diff -ru src/Makefile holotz-castle-1.3.8-src/src/Makefile
---- src/Makefile Fri Jan 20 08:59:38 2006
-+++ holotz-castle-1.3.8-src/src/Makefile Mon Jan 23 21:12:33 2006
-@@ -42,8 +42,8 @@
+@@ -28,15 +28,15 @@
+
+ # JLib
+ libJLib: $(JLIB_OBJS)
+- g++ -shared -fPIC -o $@.so $? \
++ $(CXX) -shared -fPIC -o $@.so $? \
+ && ar rvus $@.a $? \
+
+ $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
+- g++ $(CFLAGS) -c -o $@ $<
++ $(CXX) $(CFLAGS) -c -o $@ $<
+ $(UTIL)/%.o: $(UTIL)/%.cpp
+- g++ $(CFLAGS) -c -o $@ $<
++ $(CXX) $(CFLAGS) -c -o $@ $<
+ $(MATH)/%.o: $(MATH)/%.cpp
+- g++ $(CFLAGS) -c -o $@ $<
++ $(CXX) $(CFLAGS) -c -o $@ $<
+
+ .PHONY: install
+ install:
+diff -ruN src/Makefile src/Makefile
+--- src/Makefile 2007-11-01 02:27:56.000000000 +0000
++++ src/Makefile 2007-11-01 02:28:55.000000000 +0000
+@@ -42,23 +42,23 @@
# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
-+CFLAGS=-I$(X11BASE)/include -I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
-+LDFLAGS=-L$(X11BASE)/lib -L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
++CFLAGS+=-I$(LOCALBASE)/include -I. -I../JLib -Wall -Wshadow $(CPU_OPTS) -c `$(SDL_CONFIG) --cflags`
++LDFLAGS=-L$(LOCALBASE)/lib -L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
JLib:
+ $(MAKE) -C ../JLib;
+
+ %.o: %.cpp %.h
+- g++ $(CFLAGS) $(DEFINES) $< -o $@
++ $(CXX) $(CFLAGS) $(DEFINES) $< -o $@
+
+ HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
+- g++ $(LDFLAGS) $? -o $@;\
++ $(CXX) $(LDFLAGS) $? -o $@;\
+ mv HC ../holotz-castle
+
+ # HCed (Holotz's Castle editor).
+ HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
+- g++ $(LDFLAGS) $? -o $@;\
++ $(CXX) $(LDFLAGS) $? -o $@;\
+ mv HCed ../holotz-castle-editor
+
+ install:
--- holotz-castle.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071101005325.963464336>