diff options
author | dholland <dholland@pkgsrc.org> | 2008-09-01 10:06:33 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2008-09-01 10:06:33 +0000 |
commit | b17fa0cd7011758c04994a82ffbe308b12a3df68 (patch) | |
tree | df14bff25a1ed5520cb249c0bcc478a09d6bd1b3 /graphics/glew/patches | |
parent | c43c16cebf6af094ee421e4a37e972a48aefb35e (diff) | |
download | pkgsrc-b17fa0cd7011758c04994a82ffbe308b12a3df68.tar.gz |
Fix config issues leading to broken build. Set -fPIC. Add destdir support.
PKGREVISION++
Diffstat (limited to 'graphics/glew/patches')
-rw-r--r-- | graphics/glew/patches/patch-aa | 6 | ||||
-rw-r--r-- | graphics/glew/patches/patch-ac | 64 |
2 files changed, 65 insertions, 5 deletions
diff --git a/graphics/glew/patches/patch-aa b/graphics/glew/patches/patch-aa index 96db5a39318..6801c128864 100644 --- a/graphics/glew/patches/patch-aa +++ b/graphics/glew/patches/patch-aa @@ -1,14 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $ +$NetBSD: patch-aa,v 1.2 2008/09/01 10:06:33 dholland Exp $ --- config/Makefile.netbsdelf.orig 2006-02-03 13:24:33.000000000 +0000 +++ config/Makefile.netbsdelf -@@ -0,0 +1,21 @@ +@@ -0,0 +1,23 @@ +NAME = $(GLEW_NAME) +CC = cc +LD = ld +ifneq (undefined, $(origin GLEW_MX)) +CFLAGS.EXTRA = -DGLEW_MX +endif ++PICFLAG = -fPIC +X11 ?= /usr/X11R6 +LDFLAGS.SO = -shared -soname $(LIB.SONAME) +LDFLAGS.EXTRA ?= -L${X11}/lib @@ -24,3 +25,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/08/15 15:21:27 abs Exp $ +LIB.DEVLNK = lib$(NAME).so +LIB.SHARED = lib$(NAME).so.$(SO_VERSION) +LIB.STATIC = lib$(NAME).a ++SHARED_OBJ_EXT = pic_o diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac index 69eca5b48df..511c0ed565e 100644 --- a/graphics/glew/patches/patch-ac +++ b/graphics/glew/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2006/10/04 21:59:27 rillig Exp $ +$NetBSD: patch-ac,v 1.2 2008/09/01 10:06:33 dholland Exp $ ---- Makefile.orig 2006-03-03 00:02:51.000000000 +0100 -+++ Makefile 2006-10-04 23:57:19.000000000 +0200 +--- Makefile.orig 2006-03-02 18:02:51.000000000 -0500 ++++ Makefile 2008-09-01 06:02:30.000000000 -0400 @@ -87,7 +87,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) $(AR) cr $@ $^ @@ -24,3 +24,61 @@ $NetBSD: patch-ac,v 1.1 2006/10/04 21:59:27 rillig Exp $ %.o: %.c $(CC) -c $(CFLAGS) -o $@ $< +@@ -111,40 +111,40 @@ src/glew.pic_o: src/glew.c include/GL/gl + + install: all + # directories +- $(INSTALL) -d -m 0755 $(GLEW_DEST)/bin +- $(INSTALL) -d -m 0755 $(GLEW_DEST)/include/GL +- $(INSTALL) -d -m 0755 $(LIBDIR) ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(GLEW_DEST)/bin ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(GLEW_DEST)/include/GL ++ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) + # runtime + ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) +- $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/bin/ ++ $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(GLEW_DEST)/bin/ + else + ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin) + strip -x lib/$(LIB.SHARED) +- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) + else +- $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) ++ $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) + endif + endif + # development files +- $(INSTALL) -m 0644 include/GL/wglew.h $(GLEW_DEST)/include/GL +- $(INSTALL) -m 0644 include/GL/glew.h $(GLEW_DEST)/include/GL +- $(INSTALL) -m 0644 include/GL/glxew.h $(GLEW_DEST)/include/GL ++ $(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(GLEW_DEST)/include/GL ++ $(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(GLEW_DEST)/include/GL ++ $(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(GLEW_DEST)/include/GL + ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw) +- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/ + else + ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin) + strip -x lib/$(LIB.STATIC) +- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) + else +- $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) ++ $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ ++ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) + endif + endif + # utilities +- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(GLEW_DEST)/bin/ ++ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(GLEW_DEST)/bin/ + + uninstall: + $(RM) $(GLEW_DEST)/include/GL/wglew.h |