diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-03-11 15:59:02 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-03-11 15:59:02 (GMT) |
| commit | 31133c3f44685295bb3d74492cf967813fc6ea03 (patch) | |
| tree | 1cba9535109e258dfc989aa574e890ab68bd1673 /src/freeimage-1-fixes.patch | |
| parent | a0d71fec950afa0da78483a1bd555310fe7e252c (diff) | |
| download | mxe-31133c3f44685295bb3d74492cf967813fc6ea03.zip mxe-31133c3f44685295bb3d74492cf967813fc6ea03.tar.gz mxe-31133c3f44685295bb3d74492cf967813fc6ea03.tar.bz2 | |
package freeimage: fix static build and add test program
Diffstat (limited to 'src/freeimage-1-fixes.patch')
| -rw-r--r-- | src/freeimage-1-fixes.patch | 81 |
1 files changed, 1 insertions, 80 deletions
diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index d6466fb..a7dd343 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -3,89 +3,10 @@ See index.html for further information. Contains ad hoc patches for cross building. -From bc927f5ebeb38f83d6b6d36de6f4af679232ca11 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 20 Feb 2012 08:58:53 +0100 -Subject: [PATCH 1/3] makefile workarounds (MXE) - - -diff --git a/Makefile.gnu b/Makefile.gnu -index e6007ae..631eb82 100644 ---- a/Makefile.gnu -+++ b/Makefile.gnu -@@ -9,7 +9,7 @@ INCDIR ?= $(DESTDIR)/usr/include - INSTALLDIR ?= $(DESTDIR)/usr/lib
-
- # Converts cr/lf to just lf
--DOS2UNIX = dos2unix
-+DOS2UNIX = echo 'dos2unix not needed '
-
- LIBRARIES = -lstdc++
-
-@@ -40,13 +40,12 @@ all: dist -
- dist: FreeImage
- cp *.a Dist
-- cp *.so Dist
- cp Source/FreeImage.h Dist
-
- dos2unix:
- @$(DOS2UNIX) $(SRCS) $(INCLS)
-
--FreeImage: $(STATICLIB) $(SHAREDLIB)
-+FreeImage: $(STATICLIB)
-
- .c.o:
- $(CC) $(CFLAGS) -c $< -o $@
-@@ -62,12 +61,8 @@ $(SHAREDLIB): $(MODULES) -
- 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 -m 644 $(HEADER) $(INCDIR)
-+ install -m 644 $(STATICLIB) $(INSTALLDIR)
-
- clean:
- rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
--- -1.7.10.4 - - -From d0f85974b3e4057a9779d6dfad7c133f3a05f094 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Mon, 20 Feb 2012 09:47:08 +0100 -Subject: [PATCH 2/3] required win version (MXE) - - -diff --git a/Makefile.gnu b/Makefile.gnu -index 631eb82..1809017 100644 ---- a/Makefile.gnu -+++ b/Makefile.gnu -@@ -15,9 +15,9 @@ LIBRARIES = -lstdc++ -
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
-+CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS -DWINVER=0x0501
- CFLAGS += $(INCLUDE)
--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
-+CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DWINVER=0x0501
- CXXFLAGS += $(INCLUDE)
-
- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
--- -1.7.10.4 - - From f1a9c3261457568064127586e9c782664bb8df78 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 27 Oct 2012 22:57:27 +0200 -Subject: [PATCH 3/3] include string.h for memset +Subject: [PATCH 1/1] include string.h for memset taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504 |