diff --git a/0001-BUILD-respect-DESTDIR-variable.patch b/0001-BUILD-respect-DESTDIR-variable.patch new file mode 100644 index 0000000..c59eb06 --- /dev/null +++ b/0001-BUILD-respect-DESTDIR-variable.patch @@ -0,0 +1,139 @@ +From 094647cb14cf99b776f7c635068a702e4968902a Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Wed, 24 Jul 2013 01:41:27 +0200 +Subject: [PATCH] BUILD: respect DESTDIR variable + +DESTDIR is used for temporary install location +in package managers otherwise you have to add +the temporary locations to BINDIR and LIBDIR +which can cause trouble with the pkg-config file. +--- + Makefile | 74 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 37 insertions(+), 37 deletions(-) + +diff --git a/Makefile b/Makefile +index e6f08a7..9fdac23 100644 +--- a/Makefile ++++ b/Makefile +@@ -231,81 +231,81 @@ install: install.include install.lib install.pkgconfig + install.mx: install.include install.lib.mx install.pkgconfig.mx + + install.lib: glew.lib +- $(INSTALL) -d -m 0755 $(LIBDIR) ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" + # runtime + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED) "$(DESTDIR)$(BINDIR)/" + else +- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/" + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) ++ $(LN) $(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)" + endif + + # development files + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) "$(DESTDIR)$(LIBDIR)/" + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) ++ $(LN) $(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)" + endif +- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC) "$(DESTDIR)$(LIBDIR)/" + + install.lib.mx: glew.lib.mx +- $(INSTALL) -d -m 0755 $(LIBDIR) ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" + # runtime + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(BINDIR)/" + else +- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/" + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) ++ $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)" + endif + # development files + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) "$(DESTDIR)$(LIBDIR)/" + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) ++ $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX)" + endif +- $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ ++ $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) "$(DESTDIR)$(LIBDIR)/" + + install.bin: glew.bin +- $(INSTALL) -d -m 0755 $(BINDIR) +- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" ++ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" + + install.include: +- $(INSTALL) -d -m 0755 $(INCDIR) +- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/ +- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ +- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(INCDIR)" ++ $(INSTALL) -m 0644 include/GL/wglew.h "$(DESTDIR)$(INCDIR)/" ++ $(INSTALL) -m 0644 include/GL/glew.h "$(DESTDIR)$(INCDIR)/" ++ $(INSTALL) -m 0644 include/GL/glxew.h "$(DESTDIR)$(INCDIR)/" + + install.pkgconfig: glew.pc +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig +- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)/pkgconfig" ++ $(INSTALL) -m 0644 glew.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/" + + install.pkgconfig.mx: glewmx.pc +- $(INSTALL) -d -m 0755 $(LIBDIR) +- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig +- $(INSTALL) -m 0644 glewmx.pc $(LIBDIR)/pkgconfig/ ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)" ++ $(INSTALL) -d -m 0755 "$(DESTDIR)$(LIBDIR)/pkgconfig" ++ $(INSTALL) -m 0644 glewmx.pc "$(DESTDIR)$(LIBDIR)/pkgconfig/" + + uninstall: +- $(RM) $(INCDIR)/wglew.h +- $(RM) $(INCDIR)/glew.h +- $(RM) $(INCDIR)/glxew.h +- $(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX) ++ $(RM) "$(DESTDIR)$(INCDIR)/wglew.h" ++ $(RM) "$(DESTDIR)$(INCDIR)/glew.h" ++ $(RM) "$(DESTDIR)$(INCDIR)/glxew.h" ++ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK)" "$(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX)" + ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +- $(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX) ++ $(RM) "$(DESTDIR)$(BINDIR)/$(LIB.SHARED)" "$(DESTDIR)$(BINDIR)/$(LIB.SHARED.MX)" + else +- $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX) +- $(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX) ++ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)" "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)" ++ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED)" "$(DESTDIR)$(LIBDIR)/$(LIB.SHARED.MX)" + endif +- $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) +- $(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN) ++ $(RM) "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC)" "$(DESTDIR)$(LIBDIR)/$(LIB.STATIC.MX)" ++ $(RM) "$(DESTDIR)$(BINDIR)/$(GLEWINFO.BIN)" "$(DESTDIR)$(BINDIR)/$(VISUALINFO.BIN)" + + clean: + $(RM) -r tmp/ +-- +1.8.4.2 + diff --git a/glew-1.9.0-makefile.patch b/glew-1.9.0-makefile.patch index 411e7b6..20fa765 100644 --- a/glew-1.9.0-makefile.patch +++ b/glew-1.9.0-makefile.patch @@ -1,6 +1,6 @@ diff -up glew-1.10.0/Makefile.make glew-1.10.0/Makefile ---- glew-1.10.0/Makefile.make 2013-07-23 00:11:22.000000000 +1000 -+++ glew-1.10.0/Makefile 2013-11-17 17:07:03.308895478 +1000 +--- glew-1.10.0/Makefile.make 2013-11-17 18:29:37.553236393 +1000 ++++ glew-1.10.0/Makefile 2013-11-17 18:30:30.063700846 +1000 @@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor endif @@ -15,26 +15,26 @@ diff -up glew-1.10.0/Makefile.make glew-1.10.0/Makefile DIST_NAME ?= glew-$(GLEW_VERSION) DIST_SRC_ZIP ?= $(shell pwd)/$(DIST_NAME).zip @@ -237,7 +237,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE - $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ + $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" + $(INSTALL) -m 0755 lib/$(LIB.SHARED) "$(DESTDIR)$(BINDIR)/" else -- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ -+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/ +- $(INSTALL) -m 0644 lib/$(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/" ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/" endif ifneq ($(LN),) - $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) + $(LN) $(LIB.SHARED) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME)" @@ -259,7 +259,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE - $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ + $(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)" + $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(BINDIR)/" else -- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ -+ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(LIBDIR)/ +- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/" ++ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/" endif ifneq ($(LN),) - $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) + $(LN) $(LIB.SHARED.MX) "$(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX)" diff -up glew-1.10.0/config/Makefile.linux.make glew-1.10.0/config/Makefile.linux ---- glew-1.10.0/config/Makefile.linux.make 2013-11-17 17:07:03.307895450 +1000 -+++ glew-1.10.0/config/Makefile.linux 2013-11-17 17:08:27.188267881 +1000 +--- glew-1.10.0/config/Makefile.linux.make 2013-07-23 00:11:22.000000000 +1000 ++++ glew-1.10.0/config/Makefile.linux 2013-11-17 18:29:37.557236505 +1000 @@ -9,14 +9,8 @@ endif ifeq (ppc64,${M_ARCH}) ARCH64 = true diff --git a/glew.spec b/glew.spec index 4329ae1..49075f4 100644 --- a/glew.spec +++ b/glew.spec @@ -7,7 +7,8 @@ License: BSD and MIT URL: http://glew.sourceforge.net Source0: http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz -Patch0: glew-1.9.0-makefile.patch +Patch0: 0001-BUILD-respect-DESTDIR-variable.patch +Patch1: glew-1.9.0-makefile.patch BuildRequires: libGLU-devel %description @@ -48,17 +49,18 @@ libGLEWmx %prep %setup -q -%patch0 -p1 -b .make +%patch0 -p1 -b .bld +%patch1 -p1 -b .make sed -i -e 's/\r//g' config/config.guess %build -make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS -fPIC" includedir=%{_includedir} GLEW_DEST= STRIP= libdir=%{_libdir} bindir=%{_bindir} +make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS -fPIC" includedir=%{_includedir} STRIP= libdir=%{_libdir} bindir=%{_bindir} GLEW_DEST= %install rm -rf $RPM_BUILD_ROOT -make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} includedir=%{_includedir} +make install.all GLEW_DEST= DESTDIR="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} includedir=%{_includedir} rm -f $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a # sigh chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* @@ -99,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/* %changelog +* Sun Nov 17 2013 Dave Airlie 1.10.0-1 +- glew 1.10.0 + build fix + makefile hacks + * Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild