tjh.dev
gprbuild: 23.0.0 -> 24.0.0
(cherry picked from commit 71db61c8abea4d9975e2845956520256ce45f0b9)
authored by sternenseemann and committed by github-actions[bot] 2da6e446 61bf81e2
+3
-3
pkgs/development/tools/build-managers/gprbuild/boot.nix
+3
-3
pkgs/development/tools/build-managers/gprbuild/boot.nix
···
7
7
}:
8
8
9
9
let
10
-
version = "23.0.0";
10
+
version = "24.0.0";
11
11
12
12
gprConfigKbSrc = fetchFromGitHub {
13
13
name = "gprconfig-kb-${version}-src";
14
14
owner = "AdaCore";
15
15
repo = "gprconfig_kb";
16
16
rev = "v${version}";
17
-
sha256 = "1rhskq4r2plf3ia67k08misygnpr9knzw3kp3kyv5778lra8y6s2";
17
+
sha256 = "1vnjv2q63l8nq2w4wya75m40isvs78j5ss9b5ga3zx3cpdx3xh09";
18
18
};
19
19
in
20
20
···
27
27
owner = "AdaCore";
28
28
repo = "gprbuild";
29
29
rev = "v${version}";
30
-
sha256 = "1ciaq4nh98vd7r5i11v353c1ms9s5yph0yxk4fkryc6bvkm4666x";
30
+
sha256 = "096a43453z2xknn6x4hyk2ldp2wh0qhfdfmzsrks50zqcvmkq4v7";
31
31
};
32
32
33
33
nativeBuildInputs = [
+5
-6
pkgs/development/tools/build-managers/gprbuild/default.nix
+5
-6
pkgs/development/tools/build-managers/gprbuild/default.nix
···
41
41
"LIBRARY_TYPE=relocatable"
42
42
];
43
43
44
-
# Fixes gprbuild being linked statically always
45
-
patches = lib.optional (!stdenv.hostPlatform.isStatic) (fetchpatch {
46
-
name = "gprbuild-relocatable-build.patch";
47
-
url = "https://aur.archlinux.org/cgit/aur.git/plain/relocatable-build.patch?h=gprbuild&id=1d4e8a5cb982e79135a0aaa3ef87654bed1fe4f0";
48
-
sha256 = "1r3xsp1pk9h666mm8mdravkybmd5gv2f751x2ffb1kxnwq1rwiyn";
49
-
});
44
+
# Fixes gprbuild being linked statically always. Based on the AUR's patch:
45
+
# https://aur.archlinux.org/cgit/aur.git/plain/0001-Makefile-build-relocatable-instead-of-static-binary.patch?h=gprbuild&id=bac524c76cd59c68fb91ef4dfcbe427357b9f850
46
+
patches = lib.optionals (!stdenv.hostPlatform.isStatic) [
47
+
./gprbuild-relocatable-build.patch
48
+
];
50
49
51
50
buildFlags = [ "all" "libgpr.build" ];
52
51
+13
pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch
+13
pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch
···
1
+
diff --git a/Makefile b/Makefile
2
+
index 8c542078..e91cef5e 100644
3
+
--- a/Makefile
4
+
+++ b/Makefile
5
+
@@ -82,7 +82,7 @@ LIB_INSTALLER=gprinstall -p -f --target=$(TARGET) $(RBD) "--prefix=${prefix}"
6
+
CLEANER=gprclean -q $(RBD)
7
+
8
+
GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
9
+
- -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
10
+
+ -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
11
+
LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) $(LIBGPR_OS)
12
+
LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) $(LIBGPR_OS) -XBUILD=${BUILD} \
13
+
--install-name=gpr \