From f3f4feff93a39fa14e0ecc2357be87359e6ca291 Mon Sep 17 00:00:00 2001 From: jschauma Date: Sun, 9 Nov 2003 02:23:18 +0000 Subject: Patch Mesa's Makefile to use '-fno-strict-aliasing' rather than '-fstrict-aliasing', as the code contains unsafe use of aliased pointers. As suggested by tls@ in PR pkg/23381, closing said PR. --- graphics/MesaLib/Makefile | 3 ++- graphics/MesaLib/distinfo | 3 ++- graphics/MesaLib/patches/patch-ad | 13 +++++++++++++ graphics/glu/Makefile | 3 ++- graphics/glu/distinfo | 3 ++- graphics/glu/patches/patch-aa | 13 +++++++++++++ graphics/glut/Makefile | 3 ++- graphics/glut/distinfo | 3 ++- graphics/glut/patches/patch-ab | 13 +++++++++++++ 9 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 graphics/MesaLib/patches/patch-ad create mode 100644 graphics/glu/patches/patch-aa create mode 100644 graphics/glut/patches/patch-ab (limited to 'graphics') diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 3c779e09b36..68aa9730e83 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2003/09/29 21:30:28 jschauma Exp $ +# $NetBSD: Makefile,v 1.25 2003/11/09 02:23:18 jschauma Exp $ PKGNAME= MesaLib-${MESA_VERSION} +PKGREVISION= 1 WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} MAINTAINER= rh@NetBSD.org COMMENT= Graphics library similar to SGI's OpenGL diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index ddb0997973f..64fcda34a1e 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2003/09/29 21:30:28 jschauma Exp $ +$NetBSD: distinfo,v 1.14 2003/11/09 02:23:18 jschauma Exp $ SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33 SHA1 (patch-ac) = 30d3f08c2d9bbfe648a2ed2cbfade6c30a7413fe +SHA1 (patch-ad) = 807b07b1505735f23dd4148c8c838df08af6333e diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad new file mode 100644 index 00000000000..684eea5f205 --- /dev/null +++ b/graphics/MesaLib/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2003/11/09 02:23:18 jschauma Exp $ + +--- configure.orig 2003-11-08 19:10:36.000000000 -0500 ++++ configure 2003-11-08 19:10:53.000000000 -0500 +@@ -7121,7 +7121,7 @@ + if test "x$enable_optim" = xyes; then + if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then + if test "x$GCC" = xyes; then +- CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing" ++ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing" + case "$host" in + i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";; + esac diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile index 55305d38369..859ab598eb5 100644 --- a/graphics/glu/Makefile +++ b/graphics/glu/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2003/09/18 16:25:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2003/11/09 02:23:18 jschauma Exp $ PKGNAME= ${DISTNAME:C/MesaLib/glu/} +PKGREVISION= 1 WRKSRC= ${WRKDIR}/${DISTNAME:C/Lib//} MAINTAINER= rh@NetBSD.org COMMENT= GLU polygon tesselation facility for Mesa diff --git a/graphics/glu/distinfo b/graphics/glu/distinfo index be18e85f458..2a97818deb4 100644 --- a/graphics/glu/distinfo +++ b/graphics/glu/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.12 2003/09/29 21:30:28 jschauma Exp $ +$NetBSD: distinfo,v 1.13 2003/11/09 02:23:18 jschauma Exp $ SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes +SHA1 (patch-aa) = 807b07b1505735f23dd4148c8c838df08af6333e diff --git a/graphics/glu/patches/patch-aa b/graphics/glu/patches/patch-aa new file mode 100644 index 00000000000..de4a2cc7cd3 --- /dev/null +++ b/graphics/glu/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.10 2003/11/09 02:23:18 jschauma Exp $ + +--- configure.orig 2003-11-08 19:10:36.000000000 -0500 ++++ configure 2003-11-08 19:10:53.000000000 -0500 +@@ -7121,7 +7121,7 @@ + if test "x$enable_optim" = xyes; then + if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then + if test "x$GCC" = xyes; then +- CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing" ++ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing" + case "$host" in + i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";; + esac diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 1bdcb6632a2..2040843cbfc 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2003/09/18 16:25:12 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2003/11/09 02:23:18 jschauma Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} +PKGREVISION= 1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/${DISTNAME:S/Lib//} diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo index 2e3bf036810..c6d6dba5a15 100644 --- a/graphics/glut/distinfo +++ b/graphics/glut/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.15 2003/09/29 21:30:28 jschauma Exp $ +$NetBSD: distinfo,v 1.16 2003/11/09 02:23:18 jschauma Exp $ SHA1 (MesaLib-5.0.2.tar.bz2) = 948b9e1b11d1341a4230a081469f4636f702ebdc Size (MesaLib-5.0.2.tar.bz2) = 1704278 bytes SHA1 (MesaDemos-5.0.2.tar.bz2) = 012d635c3e39dfa391b1183425f0630b1f428985 Size (MesaDemos-5.0.2.tar.bz2) = 896368 bytes SHA1 (patch-aa) = d7a7dab7da7068c814a28b996bb3af6c24b48801 +SHA1 (patch-ab) = 807b07b1505735f23dd4148c8c838df08af6333e diff --git a/graphics/glut/patches/patch-ab b/graphics/glut/patches/patch-ab new file mode 100644 index 00000000000..b36f8eae0cd --- /dev/null +++ b/graphics/glut/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/11/09 02:23:18 jschauma Exp $ + +--- configure.orig 2003-11-08 19:10:36.000000000 -0500 ++++ configure 2003-11-08 19:10:53.000000000 -0500 +@@ -7121,7 +7121,7 @@ + if test "x$enable_optim" = xyes; then + if test "x$enable_debug" = xno && test "x$enable_prof" = xno; then + if test "x$GCC" = xyes; then +- CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing" ++ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fno-strict-aliasing" + case "$host" in + i*86-*-*) CFLAGS="$CFLAGS -malign-loops=2 -malign-jumps=2 -malign-functions=2";; + esac -- cgit v1.2.3