Merge pull request #34170 from dtzWill/fix/flex-cross
flex: fix for cross
This commit is contained in:
commit
f83bf0e79d
1 changed files with 14 additions and 15 deletions
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, bison, m4
|
||||
{ stdenv, buildPackages, fetchurl, bison, m4
|
||||
, fetchpatch, autoreconfHook, help2man
|
||||
}:
|
||||
|
||||
|
@ -19,28 +19,27 @@ stdenv.mkDerivation rec {
|
|||
+ "/tools/flex/patches/200-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch";
|
||||
sha256 = "1aarhcmz7mfrgh15pkj6f7ikxa2m0mllw1i1vscsf1kw5d05lw6f";
|
||||
})];
|
||||
postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
substituteInPlace Makefile.in --replace "tests" " "
|
||||
|
||||
substituteInPlace doc/Makefile.am --replace 'flex.1: $(top_srcdir)/configure.ac' 'flex.1: '
|
||||
'';
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ autoreconfHook help2man ];
|
||||
|
||||
buildInputs = [ bison ];
|
||||
|
||||
propagatedBuildInputs = [ m4 ];
|
||||
|
||||
preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
|
||||
export ac_cv_func_malloc_0_nonnull=yes
|
||||
export ac_cv_func_realloc_0_nonnull=yes
|
||||
'';
|
||||
|
||||
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
|
||||
sed -i Makefile -e 's/-no-undefined//;'
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
|
||||
# disable tests which can't run on build machine
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.in --replace "tests" " ";
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export ac_cv_func_malloc_0_nonnull=yes
|
||||
export ac_cv_func_realloc_0_nonnull=yes
|
||||
'';
|
||||
};
|
||||
dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform;
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/westes/flex;
|
||||
|
|
Loading…
Reference in a new issue