debian/patches/: patchset updated

- 0001-Fix_FTBFS_on_kFreeBSD.patch refreshed
- 0002-Drop_PHONY_on_pc_files.patch dropped
- 0002-Fix_pkgconfig_path.patch added
parent 4ee3a8f2
From: "Matteo F. Vescovi" <mfvescovi@gmail.com>
Date: Thu, 21 Aug 2014 11:13:30 +0200
From: "Matteo F. Vescovi" <mfv@debian.org>
Date: Sun, 4 Sep 2016 14:32:42 +0200
Subject: Fix_FTBFS_on_kFreeBSD
---
config/Makefile.kfreebsd | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
config/Makefile.kfreebsd | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd
index faf1046..2370798 100644
index e2ff5c3..cbce177 100644
--- a/config/Makefile.kfreebsd
+++ b/config/Makefile.kfreebsd
@@ -1,7 +1,14 @@
......@@ -17,24 +17,18 @@ index faf1046..2370798 100644
-LDFLAGS.EXTRA = -L/usr/X11R6/lib
+M_ARCH ?= $(shell uname -m)
+ifeq (x86_64,${M_ARCH})
+LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
+LIBDIR = $(GLEW_DEST)/lib64
+ 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
+ LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
+ LIBDIR = $(GLEW_DEST)/lib
+endif
LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
@@ -14,9 +21,9 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
@@ -14,4 +21,4 @@ LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
LIB.DEVLNK = lib$(NAME).so
LIB.SHARED = lib$(NAME).so.$(SO_VERSION)
LIB.STATIC = lib$(NAME).a
-LDFLAGS.SO = -shared -Wl,-soname $(LIB.SONAME)
+LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
LIB.SONAME.MX = lib$(NAME)mx.so.$(SO_MAJOR)
LIB.DEVLNK.MX = lib$(NAME)mx.so
LIB.SHARED.MX = lib$(NAME)mx.so.$(SO_VERSION)
LIB.STATIC.MX = lib$(NAME)mx.a
-LDFLAGS.SO.MX = -shared -Wl,-soname $(LIB.SONAME.MX)
+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX)
From: "Matteo F. Vescovi" <mfv@debian.org>
Date: Tue, 3 Feb 2015 16:55:24 +0100
Subject: Drop_PHONY_on_pc_files
---
Makefile | 8 --------
1 file changed, 8 deletions(-)
diff --git a/Makefile b/Makefile
index 6a9803c..b609eb7 100644
--- a/Makefile
+++ b/Makefile
@@ -127,10 +127,6 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wgl
@mkdir -p $(dir $@)
$(CC) -DGLEW_NO_GLU -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
-# Force re-write of glew.pc, GLEW_DEST can vary
-
-.PHONY: glew.pc
-
glew.pc: glew.pc.in
sed \
-e "s|@prefix@|$(GLEW_PREFIX)|g" \
@@ -168,10 +164,6 @@ tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h
@mkdir -p $(dir $@)
$(CC) -DGLEW_NO_GLU -DGLEW_MX -DGLEW_BUILD $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
-# Force re-write of glewmx.pc, GLEW_DEST can vary
-
-.PHONY: glewmx.pc
-
glewmx.pc: glew.pc.in
sed \
-e "s|@prefix@|$(GLEW_PREFIX)|g" \
From: "Matteo F. Vescovi" <mfv@debian.org>
Date: Mon, 5 Sep 2016 09:08:58 +0200
Subject: Fix_pkgconfig_path
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 88b7a54..a84a1dc 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ GLEW_DEST ?= /usr
BINDIR ?= $(GLEW_DEST)/bin
LIBDIR ?= $(GLEW_DEST)/lib
INCDIR ?= $(GLEW_DEST)/include/GL
-PKGDIR ?= $(GLEW_DEST)/lib/pkgconfig
+PKGDIR ?= $(LIBDIR)/pkgconfig
ifneq ($(GLEW_NO_GLU), -DGLEW_NO_GLU)
LIBGLU = glu
0001-Fix_FTBFS_on_kFreeBSD.patch
0002-Drop_PHONY_on_pc_files.patch
0002-Fix_pkgconfig_path.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment