diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/freeimage/install_fixes.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/freeimage/package.py | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/freeimage/install_fixes.patch b/var/spack/repos/builtin/packages/freeimage/install_fixes.patch index 21c9fadde9..a4744261de 100644 --- a/var/spack/repos/builtin/packages/freeimage/install_fixes.patch +++ b/var/spack/repos/builtin/packages/freeimage/install_fixes.patch @@ -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: diff --git a/var/spack/repos/builtin/packages/freeimage/package.py b/var/spack/repos/builtin/packages/freeimage/package.py index c464c0a6de..3b216a7084 100644 --- a/var/spack/repos/builtin/packages/freeimage/package.py +++ b/var/spack/repos/builtin/packages/freeimage/package.py @@ -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" |