Date: Mon, 1 Mar 2004 19:34:22 +0300 (MSK) From: Igor Pokrovsky <tiamat@comset.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63602: Update port: graphics/glfw fix build on 5.x alpha Message-ID: <200403011634.i21GYMnJ090780@doom.homeunix.org> Resent-Message-ID: <200403011710.i21HADfr041875@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63602
>Category: ports
>Synopsis: Update port: graphics/glfw fix build on 5.x alpha
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 01 09:10:13 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Feb 26 21:34:55 MSK 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386
>Description:
Fix build on 5.x alpha (removed optimization opts)
>How-To-Repeat:
>Fix:
--- glfw.diff begins here ---
diff -ru /usr/ports/graphics/glfw/Makefile glfw/Makefile
--- /usr/ports/graphics/glfw/Makefile Thu Feb 26 09:01:14 2004
+++ glfw/Makefile Mon Mar 1 19:27:16 2004
@@ -17,12 +17,6 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/docs/*.pdf ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ru /usr/ports/graphics/glfw/files/patch-compile.sh glfw/files/patch-compile.sh
--- /usr/ports/graphics/glfw/files/patch-compile.sh Sun Jan 25 13:39:43 2004
+++ glfw/files/patch-compile.sh Mon Mar 1 19:25:02 2004
@@ -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"
--- glfw.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?200403011634.i21GYMnJ090780>