pyrox.dev
treewide: fix ac_cv_func_setpgrp_void configure flag for BSD
authored by FliegendeWurst and committed by Alyssa Ross e6443544 ef81992b
+1
-1
pkgs/by-name/li/libdaemon/package.nix
+1
-1
pkgs/by-name/li/libdaemon/package.nix
···
25
25
[ "--disable-lynx" ]
26
26
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
27
27
# Can't run this test while cross-compiling
28
-
"ac_cv_func_setpgrp_void=yes"
28
+
"ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
29
29
];
30
30
31
31
meta = {
+5
pkgs/by-name/mo/motif/package.nix
+5
pkgs/by-name/mo/motif/package.nix
···
90
90
})
91
91
];
92
92
93
+
# provide correct configure answers for cross builds
94
+
configureFlags = [
95
+
"ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
96
+
];
97
+
93
98
env = lib.optionalAttrs stdenv.cc.isClang {
94
99
NIX_CFLAGS_COMPILE = toString [
95
100
"-Wno-error=implicit-function-declaration"
+2
-3
pkgs/by-name/sh/shadow/package.nix
+2
-3
pkgs/by-name/sh/shadow/package.nix
···
56
56
sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
57
57
'';
58
58
59
-
# Assume System V `setpgrp (void)', which is the default on GNU variants
60
-
# (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
59
+
# `AC_FUNC_SETPGRP' is not cross-compilation capable.
61
60
preConfigure = ''
62
-
export ac_cv_func_setpgrp_void=yes
61
+
export ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}
63
62
export shadow_cv_logdir=/var/log
64
63
'';
65
64
+1
-1
pkgs/by-name/w3/w3m/package.nix
+1
-1
pkgs/by-name/w3/w3m/package.nix
···
103
103
"--with-gc=${boehmgc.dev}"
104
104
]
105
105
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
106
-
"ac_cv_func_setpgrp_void=yes"
106
+
"ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
107
107
]
108
108
++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb"
109
109
++ lib.optional (graphicsSupport && !x11Support) "--without-x";
+2
-1
pkgs/development/libraries/apr/default.nix
+2
-1
pkgs/development/libraries/apr/default.nix
···
38
38
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
39
39
# For cross builds, provide answers to the configure time tests.
40
40
# These answers are valid on x86_64-linux and aarch64-linux.
41
+
# TODO: provide all valid answers for BSD.
41
42
"ac_cv_file__dev_zero=yes"
42
-
"ac_cv_func_setpgrp_void=yes"
43
+
"ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
43
44
"apr_cv_tcp_nodelay_with_cork=yes"
44
45
"ac_cv_define_PTHREAD_PROCESS_SHARED=yes"
45
46
"apr_cv_process_shared_works=yes"
+3
-1
pkgs/tools/backup/bacula/default.nix
+3
-1
pkgs/tools/backup/bacula/default.nix
···
56
56
"--with-working-dir=/var/lib/bacula"
57
57
"--mandir=\${out}/share/man"
58
58
]
59
-
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes"
59
+
++
60
+
lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
61
+
"ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
60
62
++ lib.optionals stdenv.hostPlatform.isDarwin [
61
63
# bacula’s `configure` script fails to detect CoreFoundation correctly,
62
64
# but these symbols are available in the nixpkgs CoreFoundation framework.