Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv3755/10.7/stable/main/finkinfo/graphics
Modified Files:
glew.info glew.patch
Log Message:
sync with jwhowarth's upstream patch, also explicitly choose compilers
Index: glew.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/glew.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glew.info 23 Jul 2011 01:06:43 -0000 1.1
+++ glew.info 3 Aug 2011 14:21:25 -0000 1.2
@@ -1,9 +1,9 @@
Package: glew
Version: 1.6.0
-Revision: 1
+Revision: 32
Description: OpenGL Extension Wrangler Library
License: BSD
-Maintainer: Benjamin Reed <g...@fink.racoonfink.com>
+Maintainer: Benjamin Reed <g...@fink.raccoonfink.com>
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
@@ -22,13 +22,23 @@
find . -type f -exec dos2unix {} \;
<<
PatchFile: %n.patch
-PatchFile-MD5: 7553dd13c0432b952b6fd12ce8e7d1b1
+PatchFile-MD5: 963f5ee474418f441ea68a5d5e9103af
UseMaxBuildJobs: true
CompileScript: <<
+ #!/bin/sh -ev
+
chmod -R a+rw .
chmod a+x config/*
- make GLEW_DEST=%p GLEW_APPLE_GLX=1
+
+ if [[ $(sw_vers -productVersion | cut -d. -f1-2) > 10.6 ]]; then
+ export CC=clang
+ elif [[ -x /usr/bin/gcc-4.2 ]]; then
+ export CC=gcc-4.2
+ else
+ export CC=gcc
+ fi
+ make GLEW_DEST=%p GLEW_APPLE_GLX=1 CC=$CC LD=$CC
<<
InstallScript: <<
Index: glew.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/glew.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glew.patch 23 Jul 2011 01:06:43 -0000 1.1
+++ glew.patch 3 Aug 2011 14:21:25 -0000 1.2
@@ -1,19 +1,16 @@
---- glew-1.6.0/config/Makefile.darwin.orig 2011-04-27 12:16:34.000000000
-0400
-+++ glew-1.6.0/config/Makefile.darwin 2011-04-30 20:36:30.000000000 -0400
-@@ -1,9 +1,9 @@
+diff -Nurd glew-1.6.0/config/Makefile.darwin
glew-1.6.0-new/config/Makefile.darwin
+--- glew-1.6.0/config/Makefile.darwin 2011-04-27 12:16:34.000000000 -0400
++++ glew-1.6.0-new/config/Makefile.darwin 2011-08-03 10:09:20.000000000
-0400
+@@ -1,7 +1,7 @@
NAME = $(GLEW_NAME)
--CC = cc
--LD = cc
-+CC = gcc
-+LD = gcc
- CFLAGS.EXTRA = -no-cpp-precomp -dynamic -fno-common
+ CC = cc
+ LD = cc
+-CFLAGS.EXTRA = -no-cpp-precomp -dynamic -fno-common
++CFLAGS.EXTRA = -dynamic -fno-common
PICFLAG = -fPIC
--LDFLAGS.EXTRA =
-+LDFLAGS.EXTRA =
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ LDFLAGS.EXTRA =
ifneq (undefined, $(origin GLEW_APPLE_GLX))
- CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
- LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGLU -lGL -lXext -lX11
-@@ -15,11 +15,11 @@
+@@ -15,14 +15,14 @@
WARN = -Wall -W
POPT = -O2
BIN.SUFFIX =
@@ -23,7 +20,12 @@
LIB.SHARED = lib$(NAME).$(SO_VERSION).dylib
LIB.STATIC = lib$(NAME).a
-LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED)
+-LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib
+LDFLAGS.SO = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SONAME)
-current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
- LIB.SONAME.MX = lib$(NAME)mx.$(SO_MAJOR).dylib
++LIB.SONAME.MX = lib$(NAME)mx.$(GLEW_MAJOR).dylib
LIB.DEVLNK.MX = lib$(NAME)mx.dylib
LIB.SHARED.MX = lib$(NAME)mx.$(SO_VERSION).dylib
+ LIB.STATIC.MX = lib$(NAME)mx.a
+-LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SHARED.MX)
++LDFLAGS.SO.MX = -dynamiclib -install_name $(GLEW_DEST)/lib/$(LIB.SONAME.MX)
-current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
+ SHARED_OBJ_EXT = pic_o
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
