pyrox.dev
lol
judy: fix cross compilation
+26
-6
+22
pkgs/development/libraries/judy/cross.patch
+22
pkgs/development/libraries/judy/cross.patch
···
1
+
--- a/src/Judy1/Makefile.am
2
+
+++ b/src/Judy1/Makefile.am
3
+
@@ -18,7 +18,7 @@
4
+
libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE
5
+
6
+
Judy1Tables.c: Judy1TablesGen.c
7
+
- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen
8
+
+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen
9
+
10
+
Judy1ByCount.c:../JudyCommon/JudyByCount.c
11
+
cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c
12
+
--- a/src/JudyL/Makefile.am
13
+
+++ b/src/JudyL/Makefile.am
14
+
@@ -18,7 +18,7 @@
15
+
libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE
16
+
17
+
JudyLTables.c: JudyLTablesGen.c
18
+
- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen
19
+
+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen
20
+
21
+
JudyLByCount.c: ../JudyCommon/JudyByCount.c
22
+
cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c
+4
-6
pkgs/development/libraries/judy/default.nix
+4
-6
pkgs/development/libraries/judy/default.nix
···
1
-
{lib, stdenv, fetchurl}:
1
+
{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "judy";
···
9
9
sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j";
10
10
};
11
11
12
-
# gcc 4.8 optimisations break judy.
13
-
# https://sourceforge.net/p/judy/mailman/message/31995144/
14
-
preConfigure = lib.optionalString stdenv.cc.isGNU ''
15
-
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
16
-
'';
12
+
nativeBuildInputs = [ autoreconfHook ];
13
+
depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];
14
+
patches = [ ./cross.patch ];
17
15
18
16
# Disable parallel builds as manpages lack some dependencies:
19
17
# ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs