diff --git a/packages/graphics/glew/build b/packages/graphics/glew/build index adef31a06c..d8e88973d9 100755 --- a/packages/graphics/glew/build +++ b/packages/graphics/glew/build @@ -23,10 +23,12 @@ . config/options $1 cd $PKG_BUILD -make SYSTEM=linux GLEW_DEST=/usr CC=$TARGET_CC -mkdir -p $SYSROOT_PREFIX/usr/lib - cp -PR lib/* $SYSROOT_PREFIX/usr/lib +make GLEW_DEST="/usr" \ + CC="$CC" \ + LD="$CC" \ + AR="$AR" \ + POPT="$CFLAGS" \ + LDFLAGS.EXTRA="$LDFLAGS" -mkdir -p $SYSROOT_PREFIX/usr/include - cp -PR include/* $SYSROOT_PREFIX/usr/include +make GLEW_DEST="$SYSROOT_PREFIX/usr" install diff --git a/packages/graphics/glew/install b/packages/graphics/glew/install index c7d1a5a41d..ab2fe8fbcd 100755 --- a/packages/graphics/glew/install +++ b/packages/graphics/glew/install @@ -22,11 +22,5 @@ . config/options $1 -$SCRIPTS/install libX11 -$SCRIPTS/install libXext -$SCRIPTS/install libXi -$SCRIPTS/install libXmu -$SCRIPTS/install Mesa - mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/lib*.so* $INSTALL/usr/lib diff --git a/packages/graphics/glew/meta b/packages/graphics/glew/meta index a0eaa79f09..fe8f03a054 100644 --- a/packages/graphics/glew/meta +++ b/packages/graphics/glew/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="glew" -PKG_VERSION="1.5.8" +PKG_VERSION="1.6.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" diff --git a/packages/graphics/glew/patches/glew-1.5.8-010_crosscompiling.patch b/packages/graphics/glew/patches/glew-1.5.8-010_crosscompiling.patch deleted file mode 100644 index 2c9d65b92a..0000000000 --- a/packages/graphics/glew/patches/glew-1.5.8-010_crosscompiling.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur glew-1.5.2/config/Makefile.linux glew-1.5.2.patch/config/Makefile.linux ---- glew-1.5.2/config/Makefile.linux 2009-12-31 18:06:19.000000000 +0100 -+++ glew-1.5.2.patch/config/Makefile.linux 2010-02-25 17:56:39.061037970 +0100 -@@ -1,19 +1,13 @@ - NAME = $(GLEW_NAME) --CC = cc --LD = cc -+CC = $(CC) -+LD = $(CC) - ifneq (undefined, $(origin GLEW_MX)) - CFLAGS.EXTRA = -DGLEW_MX - endif - PICFLAG = -fPIC - LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME) - M_ARCH ?= $(shell uname -m) --ifeq (x86_64,${M_ARCH}) --LDFLAGS.EXTRA = -L/usr/X11R6/lib64 --LIBDIR = $(GLEW_DEST)/lib64 --else --LDFLAGS.EXTRA = -L/usr/X11R6/lib - LIBDIR = $(GLEW_DEST)/lib --endif - LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 - LDFLAGS.STATIC = -Wl,-Bstatic - LDFLAGS.DYNAMIC = -Wl,-Bdynamic