diff options
| author | Phillip Warner <pc_warner@yahoo.com> | 2010-05-13 00:28:31 +0200 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-05-13 00:28:31 +0200 |
| commit | 82a3389257dcc55831395a57f6925ac58671f595 (patch) | |
| tree | 7dac007469440ecfd024769d19bb61f843d1bf94 /libraries/FreeImage/Makefile.gnu.DESTDIR.diff | |
| parent | ff3b69ded4b5a3e3df71c0ef50c4282d1c056fb7 (diff) | |
| download | slackbuilds-82a3389257dcc55831395a57f6925ac58671f595.tar.gz | |
libraries/FreeImage: Updated for version 3.12.0
Diffstat (limited to 'libraries/FreeImage/Makefile.gnu.DESTDIR.diff')
| -rw-r--r-- | libraries/FreeImage/Makefile.gnu.DESTDIR.diff | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/libraries/FreeImage/Makefile.gnu.DESTDIR.diff b/libraries/FreeImage/Makefile.gnu.DESTDIR.diff index d9e94b4483..07d2579cf9 100644 --- a/libraries/FreeImage/Makefile.gnu.DESTDIR.diff +++ b/libraries/FreeImage/Makefile.gnu.DESTDIR.diff @@ -1,42 +1,39 @@ -Patch generated 20071214 by Robby Workman <rworkman@slackbuilds.org> -Permission granted to use this patch as you see fit. - ---- FreeImage/Makefile.gnu.orig 2007-12-14 13:34:39.717234989 -0600 -+++ FreeImage/Makefile.gnu 2007-12-14 13:52:18.417121669 -0600 -@@ -14,13 +14,13 @@ - # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
-
--COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden
-+COMPILERFLAGS = -fPIC -fexceptions -fvisibility=hidden
- LIBRARIES = -lstdc++
+--- FreeImage/Makefile.gnu.orig 2009-09-07 01:09:57.000000000 -0500 ++++ FreeImage/Makefile.gnu 2009-09-07 01:27:41.000000000 -0500 +@@ -15,16 +15,11 @@ MODULES = $(SRCS:.c=.o)
MODULES := $(MODULES:.cpp=.o)
--CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
--CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
-+CFLAGS += $(COMPILERFLAGS) $(INCLUDE)
-+CXXFLAGS += $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
+-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
++CFLAGS ?= -fPIC -fexceptions -fvisibility=hidden
+ CFLAGS += $(INCLUDE)
+-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
++CXXFLAGS ?= -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
+ CXXFLAGS += $(INCLUDE)
+-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
+- CFLAGS += -fPIC
+- CXXFLAGS += -fPIC
+-endif
+-
TARGET = freeimage
STATICLIB = lib$(TARGET).a
-@@ -58,12 +58,13 @@ - $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+ SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
+@@ -61,10 +56,13 @@ + $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
install:
+- install -d $(INCDIR) $(INSTALLDIR)
- install -m 644 -o root -g root $(HEADER) $(INCDIR)
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
-- ldconfig
+ install -d 755 $(DESTDIR)/$(INCDIR)
+ install -m 644 $(HEADER) $(DESTDIR)/$(INCDIR)
+ install -d 755 $(DESTDIR)/$(INSTALLDIR)
+ install -m 644 $(STATICLIB) $(DESTDIR)/$(INSTALLDIR)
+ install -m 755 $(SHAREDLIB) $(DESTDIR)/$(INSTALLDIR)
+ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(SHAREDLIB) $(VERLIBNAME)
-+ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(VERLIBNAME) $(LIBNAME)
++ cd $(DESTDIR)/$(INSTALLDIR) ; ln -sf $(VERLIBNAME) $(LIBNAME)
clean:
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
|