From 8540e9c19a6e1fd312214cf264b679695b5e5762 Mon Sep 17 00:00:00 2001 From: fiesh Date: Tue, 22 Dec 2015 13:45:56 +0100 Subject: fix freeimage build Add the FREEIMAGE_LIB define in order to keep the build process from defining dllspec specifications. Remove -fPIC to fix a warning. --- src/freeimage-2-fixes.patch | 18 ++++++++++++++++++ src/freeimage.mk | 1 - 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/freeimage-2-fixes.patch diff --git a/src/freeimage-2-fixes.patch b/src/freeimage-2-fixes.patch new file mode 100644 index 0000000..6ea967a --- /dev/null +++ b/src/freeimage-2-fixes.patch @@ -0,0 +1,18 @@ +This file is part of MXE. +See index.html for further information. + +Add the FREEIMAGE_LIB define in order to keep the build process from defining +dllspec specifications. + +diff -ur a/Makefile.fip b/Makefile.fip +--- a/Makefile.fip 2010-12-09 15:12:12.000000000 +0100 ++++ b/Makefile.fip 2015-12-22 13:24:33.071944345 +0100 +@@ -17,7 +17,7 @@ + MODULES := $(MODULES:.cpp=.o) + CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy ++CXXFLAGS ?= -O3 -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DFREEIMAGE_LIB + CXXFLAGS += $(INCLUDE) + + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) diff --git a/src/freeimage.mk b/src/freeimage.mk index bb85db2..d83f3b0 100644 --- a/src/freeimage.mk +++ b/src/freeimage.mk @@ -27,7 +27,6 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.fip \ CXX='$(TARGET)-g++' \ - CXXFLAGS='-DFREEIMAGE_LIB' \ CC='$(TARGET)-gcc' \ AR='$(TARGET)-ar' \ RC='$(TARGET)-windres' \ -- cgit v0.12