diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-03-01 19:13:37 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-03-01 19:13:37 +0000 |
| commit | 13d730720fec41a24863914e9b4bc45d941019b1 (patch) | |
| tree | 1c6b5b1733c2165c3f18bae130d6bb8ffd0d56eb /graphics | |
| parent | - Update to 0.99.7 [1] (diff) | |
- Fix build on 5.x alpha
PR: ports/63602
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=102670
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/glfw/Makefile | 8 | ||||
| -rw-r--r-- | graphics/glfw/files/patch-compile.sh | 36 |
2 files changed, 22 insertions, 22 deletions
diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 8735180b5a10..3e97b9581817 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -17,12 +17,6 @@ USE_X_PREFIX= yes USE_GL= yes ALL_TARGET= x11 -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} >= 502102 -BROKEN= "Does not compile on alpha 5.x" -.endif - do-configure: @(cd ${WRKSRC} && \ ${SETENV} CC="${CC}" \ @@ -44,4 +38,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/glfw/files/patch-compile.sh b/graphics/glfw/files/patch-compile.sh index 3ad8796de369..7119b20d16fa 100644 --- a/graphics/glfw/files/patch-compile.sh +++ b/graphics/glfw/files/patch-compile.sh @@ -1,5 +1,5 @@ --- compile.sh.orig Wed Jan 8 12:19:48 2003 -+++ compile.sh Sat Jan 24 18:39:15 2004 ++++ compile.sh Mon Mar 1 19:15:54 2004 @@ -69,10 +69,10 @@ ########################################################################## if [ "x$force_gcc" = xyes ]; then @@ -76,12 +76,6 @@ - cat conftest.c >&5 -fi -rm -f conftest* -- --echo " sysconf support: ""$has_sysconf" 1>&6 --if [ "x$has_sysconf" = xyes ]; then -- CFLAGS="$CFLAGS -D_GLFW_HAS_SYSCONF" --fi --echo " " 1>&6 +#if { (eval echo $config_script: \"$link\") 1>&5; (eval $link) 2>&5; }; then +# rm -rf conftest* +# has_sysconf=yes @@ -90,7 +84,12 @@ +# cat conftest.c >&5 +#fi +#rm -f conftest* -+ + +-echo " sysconf support: ""$has_sysconf" 1>&6 +-if [ "x$has_sysconf" = xyes ]; then +- CFLAGS="$CFLAGS -D_GLFW_HAS_SYSCONF" +-fi +-echo " " 1>&6 +#echo " sysconf support: ""$has_sysconf" 1>&6 +#if [ "x$has_sysconf" = xyes ]; then +# CFLAGS="$CFLAGS -D_GLFW_HAS_SYSCONF" @@ -99,19 +98,26 @@ ########################################################################## -@@ -337,7 +339,8 @@ +@@ -337,17 +339,18 @@ ########################################################################## # Post fixups ########################################################################## -if [ "x$CC" = xgcc ]; then +- CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O3 -ffast-math -Wall" +- CFLAGS="-c -I. -I.. $CFLAGS -Os -Wall" +- CFLAGS_LINK="-O3 -ffast-math -Wall" +CFLAGS_NO_COMPILE="${CFLAGS}" +if [ "x$use_gcc" = xyes ]; then - CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O3 -ffast-math -Wall" - CFLAGS="-c -I. -I.. $CFLAGS -Os -Wall" - CFLAGS_LINK="-O3 -ffast-math -Wall" -@@ -346,8 +349,8 @@ - CFLAGS="-c -I. -I.. $CFLAGS -O" - CFLAGS_LINK="-O" ++ CFLAGS_SPEED="-c -I. -I.. $CFLAGS -Wall" ++ CFLAGS="-c -I. -I.. $CFLAGS -Wall" ++ CFLAGS_LINK="-Wall" + else +- CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O" +- CFLAGS="-c -I. -I.. $CFLAGS -O" +- CFLAGS_LINK="-O" ++ CFLAGS_SPEED="-c -I. -I.. $CFLAGS" ++ CFLAGS="-c -I. -I.. $CFLAGS" ++ CFLAGS_LINK="" fi -CFLAGS_LINK="-I../include $CFLAGS_LINK" -LFLAGS="$LFLAGS -L../lib/x11 -s -lglfw -lGLU $LIBS -lpthread -lm" |