freeimage: fails to compile with c++17, use c++14 (#35067)
* freeimage: fails to compile with c++17, use c++14 Only `opencascade` when a (non-default) variant depends on `freeimage`, which seems to have gone unmaintained. There are c++17 standard violations [[1]]( https://en.cppreference.com/w/cpp/language/except_spec) in the code, so we can at most expect c++14. Since some compilers default to c++17 (gcc-12) we need to be explicit. * freeimage: install directly in prefix * freeimage: fix inverted patch
This commit is contained in:
parent
c2d68975bc
commit
0f2e0a01a9
@ -1,5 +1,16 @@
|
||||
--- a/Makefile.gnu 2015-03-10 09:04:00.000000000 +0100
|
||||
+++ b/Makefile.gnu 2019-03-15 13:20:12.480698778 +0100
|
||||
+++ b/Makefile.gnu 2023-01-21 15:53:35.782911926 -0600
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
# General configuration variables:
|
||||
DESTDIR ?= /
|
||||
-INCDIR ?= $(DESTDIR)/usr/include
|
||||
-INSTALLDIR ?= $(DESTDIR)/usr/lib
|
||||
+INCDIR ?= $(DESTDIR)/include
|
||||
+INSTALLDIR ?= $(DESTDIR)/lib
|
||||
|
||||
# Converts cr/lf to just lf
|
||||
DOS2UNIX = dos2unix
|
||||
@@ -71,9 +71,9 @@
|
||||
|
||||
install:
|
||||
|
@ -19,6 +19,7 @@ class Freeimage(MakefilePackage):
|
||||
|
||||
def edit(self, spec, prefix):
|
||||
env["DESTDIR"] = prefix
|
||||
env["CXXFLAGS"] = "-std=c++14"
|
||||
|
||||
def url_for_version(self, version):
|
||||
url = "https://downloads.sourceforge.net/project/freeimage/Source%20Distribution/{0}/FreeImage{1}.zip"
|
||||
|
Loading…
Reference in New Issue
Block a user