AnotherFoxGuy/ror-conan-recipes
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

🐛 Fixed freeimage build with GCC 11

Browse Source
This commit is contained in:
Edgar
2021-08-09 15:53:33 +02:00
parent 5b1f168fcf
commit 1ff57b2f9a
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
freeimage/all/conandata.yml
View File

@@ -2,3 +2,6 @@ sources:
"3.18.0": "3.18.0":
url: "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip" url: "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip"
sha256: "f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd" sha256: "f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd"
patches:
"3.18.0":
- patch_file: "patches/3.18.0/cpp11.patch"

3
freeimage/all/conanfile.py
View File

@@ -9,9 +9,12 @@ class freeimageConan(ConanFile):
url = "https://github.com/AnotherFoxGuy/conan-freeimage" url = "https://github.com/AnotherFoxGuy/conan-freeimage"
description = "FreeImage is an Open Source library project for developers who would like to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications." description = "FreeImage is an Open Source library project for developers who would like to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications."
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
exports_sources = "patches/**"
def source(self): def source(self):
tools.get(**self.conan_data["sources"][self.version], strip_root=True) tools.get(**self.conan_data["sources"][self.version], strip_root=True)
for patch in self.conan_data["patches"][self.version]:
tools.patch(**patch)
def build(self): def build(self):
if os_info.is_windows: if os_info.is_windows:

11
freeimage/all/patches/3.18.0/cpp11.patch Normal file
View File

@@ -0,0 +1,11 @@
--- Makefile.gnu
+++ Makefile.gnu
@@ -25,7 +25,7 @@
CFLAGS += $(INCLUDE)
CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
# LibJXR
-CXXFLAGS += -D__ANSI__
+CXXFLAGS += -D__ANSI__ -std=c++11
CXXFLAGS += $(INCLUDE)
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)