fix release build for uClibc raspberry-pi

3 files changed, 132 insertions, 38 deletions

diff --git a/package/libglew/patches/patch-Makefile b/package/libglew/patches/patch-Makefile
index 9223c9ae8..51cabbe77 100644
--- a/package/libglew/patches/patch-Makefile
+++ b/package/libglew/patches/patch-Makefile
@@ -1,5 +1,23 @@
 --- glew-1.10.0.orig/Makefile	2013-07-22 16:11:22.000000000 +0200
-+++ glew-1.10.0/Makefile	2013-07-30 13:16:20.000000000 +0200
++++ glew-1.10.0/Makefile	2013-12-08 15:26:15.000000000 +0100
+@@ -31,13 +31,13 @@
+ include config/version
+ 
+ SHELL = /bin/sh
+-SYSTEM ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
+-SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1)
++SYSTEMS ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
++SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEMS) && echo 1)
+ 
+ ifeq ($(SYSTEM.SUPPORTED), 1)
+-include config/Makefile.$(SYSTEM)
++include config/Makefile.$(SYSTEMS)
+ else
+-$(error "Platform '$(SYSTEM)' not supported")
++$(error "Platform '$(SYSTEMS)' not supported")
+ endif
+ 
+ GLEW_DEST ?= /usr
 @@ -71,7 +71,8 @@ else
  OPT = $(POPT)
  endif
@@ -10,3 +28,116 @@
  
  all debug: glew.lib glew.lib.mx glew.bin
  
+@@ -83,14 +84,14 @@ LIB.LIBS           := $(GL_LDFLAGS)
+ LIB.SRCS           := src/glew.c
+ LIB.SRCS.NAMES     := $(notdir $(LIB.SRCS))
+ 
+-LIB.OBJS           := $(addprefix tmp/$(SYSTEM)/default/static/,$(LIB.SRCS.NAMES))
++LIB.OBJS           := $(addprefix tmp/$(SYSTEMS)/default/static/,$(LIB.SRCS.NAMES))
+ LIB.OBJS           := $(LIB.OBJS:.c=.o)
+-LIB.SOBJS          := $(addprefix tmp/$(SYSTEM)/default/shared/,$(LIB.SRCS.NAMES))
++LIB.SOBJS          := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(LIB.SRCS.NAMES))
+ LIB.SOBJS          := $(LIB.SOBJS:.c=.o)
+ 
+-LIB.OBJS.MX        := $(addprefix tmp/$(SYSTEM)/mx/static/,$(LIB.SRCS.NAMES))
++LIB.OBJS.MX        := $(addprefix tmp/$(SYSTEMS)/mx/static/,$(LIB.SRCS.NAMES))
+ LIB.OBJS.MX        := $(LIB.OBJS.MX:.c=.o)
+-LIB.SOBJS.MX       := $(addprefix tmp/$(SYSTEM)/mx/shared/,$(LIB.SRCS.NAMES))
++LIB.SOBJS.MX       := $(addprefix tmp/$(SYSTEMS)/mx/shared/,$(LIB.SRCS.NAMES))
+ LIB.SOBJS.MX       := $(LIB.SOBJS.MX:.c=.o)
+ 
+ glew.lib: lib lib/$(LIB.SHARED) lib/$(LIB.STATIC) glew.pc
+@@ -114,11 +115,11 @@ ifneq ($(STRIP),)
+ 	$(STRIP) -x $@
+ endif
+ 
+-tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+-tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+@@ -154,11 +155,11 @@ ifneq ($(STRIP),)
+ 	$(STRIP) -x $@
+ endif
+ 
+-tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU -DGLEW_MX -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+-tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
++tmp/$(SYSTEMS)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
+ 	@mkdir -p $(dir $@)
+ 	$(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
+ 
+@@ -183,17 +184,17 @@ BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(
+ 
+ GLEWINFO.BIN       := glewinfo$(BIN.SUFFIX)
+ GLEWINFO.BIN.SRC   := src/glewinfo.c
+-GLEWINFO.BIN.OBJ   := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC)))
++GLEWINFO.BIN.OBJ   := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC)))
+ GLEWINFO.BIN.OBJ   := $(GLEWINFO.BIN.OBJ:.c=.o)
+ 
+ VISUALINFO.BIN     := visualinfo$(BIN.SUFFIX)
+ VISUALINFO.BIN.SRC := src/visualinfo.c
+-VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC)))
++VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC)))
+ VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o)
+ 
+ # Don't build glewinfo or visualinfo for NaCL, yet.
+ 
+-ifneq ($(filter nacl%,$(SYSTEM)),)
++ifneq ($(filter nacl%,$(SYSTEMS)),)
+ glew.bin: glew.lib bin
+ else
+ glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) 
+@@ -233,7 +234,7 @@ install.mx:  install.include install.lib
+ install.lib: glew.lib
+ 	$(INSTALL) -d -m 0755 $(LIBDIR)
+ # runtime
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -d -m 0755 $(BINDIR)
+ 	$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
+ else
+@@ -244,7 +245,7 @@ ifneq ($(LN),)
+ endif
+ 
+ # development files
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
+ endif
+ ifneq ($(LN),)
+@@ -255,7 +256,7 @@ endif
+ install.lib.mx: glew.lib.mx
+ 	$(INSTALL) -d -m 0755 $(LIBDIR)
+ # runtime
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -d -m 0755 $(BINDIR)
+ 	$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
+ else
+@@ -265,7 +266,7 @@ ifneq ($(LN),)
+ 	$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
+ endif
+ # development files
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
+ endif
+ ifneq ($(LN),)
+@@ -298,7 +299,7 @@ uninstall:
+ 	$(RM) $(INCDIR)/glew.h
+ 	$(RM) $(INCDIR)/glxew.h
+ 	$(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX)
+-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
++ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),)
+ 	$(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX)
+ else
+ 	$(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX)
diff --git a/package/libglew/patches/patch-Makefile.orig b/package/libglew/patches/patch-Makefile.orig
deleted file mode 100644
index c31216b42..000000000
--- a/package/libglew/patches/patch-Makefile.orig
+++ /dev/null
@@ -1,11 +0,0 @@
---- glew-1.10.0.orig/Makefile	2013-07-22 16:11:22.000000000 +0200
-+++ glew-1.10.0/Makefile	2013-07-30 13:15:41.000000000 +0200
-@@ -71,7 +71,7 @@ else
- OPT = $(POPT)
- endif
- INCLUDE = -Iinclude
--CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
-+CFLAGS ?= $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA)
- 
- all debug: glew.lib glew.lib.mx glew.bin
- 
diff --git a/package/libglew/patches/patch-config_Makefile_linux.orig b/package/libglew/patches/patch-config_Makefile_linux.orig
deleted file mode 100644
index 75adbb36e..000000000
--- a/package/libglew/patches/patch-config_Makefile_linux.orig
+++ /dev/null
@@ -1,26 +0,0 @@
---- glew-1.10.0.orig/config/Makefile.linux	2013-07-22 16:11:22.000000000 +0200
-+++ glew-1.10.0/config/Makefile.linux	2013-07-30 13:14:42.000000000 +0200
-@@ -1,21 +1,7 @@
- NAME = $(GLEW_NAME)
--CC = cc
--LD = cc
-+CC ?= cc
-+LD ?= cc
- M_ARCH ?= $(shell uname -m)
--ARCH64 = false
--ifeq (x86_64,${M_ARCH})
--  ARCH64 = true
--endif
--ifeq (ppc64,${M_ARCH})
--  ARCH64 = true
--endif
--ifeq (${ARCH64},true)
--  LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
--  LIBDIR = $(GLEW_DEST)/lib64
--else
--  LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
--  LIBDIR = $(GLEW_DEST)/lib
--endif
- LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
- LDFLAGS.STATIC = -Wl,-Bstatic
- LDFLAGS.DYNAMIC = -Wl,-Bdynamic