JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ilmbase: fix cross

Browse Source
This commit is contained in:
Robin Gloster 2018-11-29 13:06:12 +01:00
parent 06f9b4769b
commit 694b4d29e1
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/development/libraries/ilmbase/cross.patch Normal file
View File

@ -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

7
pkgs/development/libraries/ilmbase/default.nix
View File

@ -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"