diff options
| author | Robin Gloster <mail@glob.in> | 2018-11-29 13:06:12 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-11-29 13:06:27 +0100 |
| commit | 694b4d29e1d0e4c86d497da437a3eed90910a7db (patch) | |
| tree | 62ea86250ba0592195e156c7e3d6f3dc8d490edd /pkgs/development/libraries/ilmbase | |
| parent | 06f9b4769b3ee74cd74e915a457b9ce690e019d6 (diff) | |
| download | nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.tar nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.tar.gz nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.tar.bz2 nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.tar.lz nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.tar.xz nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.tar.zst nixpkgs-694b4d29e1d0e4c86d497da437a3eed90910a7db.zip | |
ilmbase: fix cross
Diffstat (limited to 'pkgs/development/libraries/ilmbase')
| -rw-r--r-- | pkgs/development/libraries/ilmbase/cross.patch | 35 | ||||
| -rw-r--r-- | pkgs/development/libraries/ilmbase/default.nix | 7 |
2 files changed, 39 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ilmbase/cross.patch b/pkgs/development/libraries/ilmbase/cross.patch new file mode 100644 index 00000000000..207a440a0d8 --- /dev/null +++ b/pkgs/development/libraries/ilmbase/cross.patch @@ -0,0 +1,35 @@ +From: Helmut Grohne <> +Subject: compile build tools with the build architecture compiler + +Patch-Source: https://github.com/openexr/openexr/issues/221 + +Index: ilmbase-2.2.0/configure.ac +=================================================================== +--- ilmbase-2.2.0.orig/configure.ac ++++ ilmbase-2.2.0/configure.ac +@@ -28,6 +28,7 @@ + AC_PROG_LN_S + AC_PROG_LIBTOOL + AC_PROG_MAKE_SET ++AX_PROG_CXX_FOR_BUILD + + dnl + dnl PKGCONFIG preparations +Index: ilmbase-2.2.0/Half/Makefile.am +=================================================================== +--- ilmbase-2.2.0.orig/Half/Makefile.am ++++ ilmbase-2.2.0/Half/Makefile.am +@@ -17,9 +17,11 @@ + + CLEANFILES = eLut eLut.h toFloat toFloat.h + +-eLut_SOURCES = eLut.cpp ++eLut$(EXEEXT): eLut.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + +-toFloat_SOURCES = toFloat.cpp ++toFloat$(EXEEXT): toFloat.cpp ++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ + + eLut.h: eLut + ./eLut > eLut.h diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 3989e941b6b..98370f52e18 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, which }: +{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }: stdenv.mkDerivation rec { name = "ilmbase-${version}"; @@ -16,11 +16,12 @@ stdenv.mkDerivation rec { ./bootstrap ''; - buildInputs = [ automake autoconf libtool which ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ automake autoconf libtool which ]; NIX_CFLAGS_LINK = [ "-pthread" ]; - patches = [ ./bootstrap.patch ]; + patches = [ ./bootstrap.patch ./cross.patch ]; # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" |