On Wednesday 07 March 2012 01:15:30 Ryan Freeman wrote:
> Attached is the still-building port of eduke32 that I have
> been sitting on for far too long. Antti Harri did most of
> the initial work of getting fixes pushed upstream.
>
> I have pulled a recent snapshot from their repos, and
> as those are done daily, we may wish to wait for a real
> release, if those happen. Here you go, Edd!
>
> -ryan
Hi, I took a quick look at this. Was the port honoring CC for you?
Didn't seem to work for me. Anyway using MAKE_FLAGS is cleaner.
Removed the hard-coded optimizations and disabled debugging.
PS. The entry pointing to my dist site isn't working anymore because
it only contains the previous snapshot. Let me know if it's still needed
and I'll put the new one on my server where I have all the other distfiles.
--
Antti Harri
diff -uNr eduke32/Makefile /usr/ports/games/eduke32/Makefile
--- eduke32/Makefile Wed Mar 7 01:01:18 2012
+++ /usr/ports/games/eduke32/Makefile Wed Mar 7 09:44:39 2012
@@ -41,7 +41,7 @@
3dduke13.zip:0
SEPERATE_BUILD = concurrent
-MAKE_FLAGS = PRETTY_OUTPUT=0 DEBUGANYWAY=1
+MAKE_FLAGS = PRETTY_OUTPUT=0 CC="${CC}" CXX="${CXX}"
USE_GMAKE = Yes
NO_REGRESS = Yes
diff -uNr eduke32/patches/patch-Makefile_common
/usr/ports/games/eduke32/patches/patch-Makefile_common
--- eduke32/patches/patch-Makefile_common Thu May 26 00:44:16 2011
+++ /usr/ports/games/eduke32/patches/patch-Makefile_common Wed Mar 7
09:48:33 2012
@@ -1,15 +1,11 @@
$OpenBSD$
-
-Make build honor CC
-
---- Makefile.common.orig Wed May 25 10:52:37 2011
-+++ Makefile.common Wed May 25 10:53:18 2011
-@@ -56,8 +56,6 @@ endif
+--- Makefile.common.orig Wed Mar 7 09:48:09 2012
++++ Makefile.common Wed Mar 7 09:48:29 2012
+@@ -89,7 +89,6 @@ endif
-
- # Tools
--CC=gcc
--CXX=g++
- AS=nasm
- AR=ar
- RC=windres
+ ifneq (0,$(RELEASE))
+ # Debugging disabled
+- debug+= -O$(OPTLEVEL)
+ ifneq ($(CC),clang)
+ debug+= -funswitch-loops
+ endif
diff -uNr eduke32/patches/patch-build_src_glbuild_c
/usr/ports/games/eduke32/patches/patch-build_src_glbuild_c
--- eduke32/patches/patch-build_src_glbuild_c Thu May 26 00:45:35 2011
+++ /usr/ports/games/eduke32/patches/patch-build_src_glbuild_c Wed Mar 7
09:45:40 2012
@@ -3,9 +3,9 @@
allow dlopen to find our libGL.so, falling back to libGL.so.1 for
linux or others.
---- build/src/glbuild.c.orig Sat Jan 15 18:50:27 2011
-+++ build/src/glbuild.c Wed May 25 11:28:36 2011
-@@ -330,6 +330,8 @@ int32_t loadgldriver(const char *driver)
+--- build/src/glbuild.c.orig Tue Oct 11 19:52:53 2011
++++ build/src/glbuild.c Wed Mar 7 09:45:03 2012
+@@ -338,6 +338,8 @@ int32_t loadgldriver(const char *driver)
driver = "opengl32.dll";
#elif defined __APPLE__
driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
@@ -14,7 +14,7 @@
#else
driver = "libGL.so.1";
#endif
-@@ -921,6 +923,8 @@ int32_t loadglulibrary(const char *driver)
+@@ -936,6 +938,8 @@ int32_t loadglulibrary(const char *driver)
driver = "glu32.dll";
#elif defined __APPLE__
driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; //
FIXME: like I know anything about Apple. Hah.
