]>
Commit | Line | Data |
---|---|---|
875f4383 AB |
1 | diff -Naur a/configure b/configure |
2 | --- a/configure 2021-06-10 16:49:17.000000000 +0200 | |
3 | +++ b/configure 2021-08-19 11:14:56.964232407 +0200 | |
4 | @@ -654,6 +654,7 @@ | |
5 | RUSERS | |
6580bdeb MT |
6 | SNMPWALK |
7 | SNMPGET | |
6580bdeb MT |
8 | +ENABLE_REPRODUCIBLE_BUILDS |
9 | openssl_version_check_config | |
10 | WITH_DHCP | |
11 | modconfdir | |
875f4383 | 12 | @@ -5986,6 +5987,7 @@ |
6580bdeb MT |
13 | fi |
14 | ||
15 | ||
16 | +ENABLE_REPRODUCIBLE_BUILDS=yes | |
17 | # Check whether --enable-reproducible-builds was given. | |
18 | if test "${enable_reproducible_builds+set}" = set; then : | |
19 | enableval=$enable_reproducible_builds; case "$enableval" in | |
875f4383 | 20 | @@ -5997,6 +5999,7 @@ |
6580bdeb MT |
21 | ;; |
22 | *) | |
23 | reproducible_builds=no | |
24 | + ENABLE_REPRODUCIBLE_BUILDS=no | |
25 | esac | |
26 | ||
27 | fi | |
875f4383 AB |
28 | diff -Naur a/configure.ac b/configure.ac |
29 | --- a/configure.ac 2021-06-10 16:49:17.000000000 +0200 | |
30 | +++ b/configure.ac 2021-08-19 11:17:10.786259778 +0200 | |
31 | @@ -690,6 +690,7 @@ | |
6580bdeb MT |
32 | dnl # |
33 | dnl # extra argument: --enable-reproducible-builds | |
34 | dnl # | |
35 | +ENABLE_REPRODUCIBLE_BUILDS=yes | |
36 | AC_ARG_ENABLE(reproducible-builds, | |
37 | [AS_HELP_STRING([--enable-reproducible-builds], | |
38 | [ensure the build does not change each time])], | |
875f4383 | 39 | @@ -701,8 +702,10 @@ |
6580bdeb MT |
40 | ;; |
41 | *) | |
42 | reproducible_builds=no | |
43 | + ENABLE_REPRODUCIBLE_BUILDS=no | |
44 | esac ] | |
45 | ) | |
46 | +AC_SUBST(ENABLE_REPRODUCIBLE_BUILDS) | |
47 | ||
48 | ||
49 | dnl ############################################################# | |
875f4383 AB |
50 | diff -Naur a/Make.inc.in b/Make.inc.in |
51 | --- a/Make.inc.in 2021-06-10 16:49:17.000000000 +0200 | |
52 | +++ b/Make.inc.in 2021-08-19 10:56:52.236404050 +0200 | |
53 | @@ -174,6 +174,10 @@ | |
54 | TESTBIN = ./$(BUILD_DIR)/bin | |
55 | endif | |
56 | ||
57 | +# | |
58 | +# With reproducible builds, do not generate certificates during installation | |
59 | +# | |
60 | +ENABLE_REPRODUCIBLE_BUILDS = @ENABLE_REPRODUCIBLE_BUILDS@ | |
61 | ||
62 | # | |
63 | # For creating documentation via doc/all.mk | |
64 | diff -Naur a/raddb/all.mk b/raddb/all.mk | |
65 | --- a/raddb/all.mk 2021-06-10 16:49:17.000000000 +0200 | |
66 | +++ b/raddb/all.mk 2021-08-19 11:18:58.640674802 +0200 | |
67 | @@ -124,7 +124,11 @@ | |
6580bdeb MT |
68 | ifneq "$(LOCAL_CERT_PRODUCTS)" "" |
69 | $(LOCAL_CERT_PRODUCTS): | |
70 | @echo BOOTSTRAP raddb/certs/ | |
71 | +ifeq "$(ENABLE_REPRODUCIBLE_BUILDS)" "yes" | |
72 | + @$(MAKE) -C $(R)$(raddbdir)/certs/ passwords.mk | |
875f4383 | 73 | +else |
6580bdeb MT |
74 | @$(MAKE) -C $(R)$(raddbdir)/certs/ |
75 | +endif | |
76 | ||
77 | # Bootstrap is special | |
78 | $(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS) |