diff options
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2021-07-12 18:14:46 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2021-07-12 18:14:46 +0100
commit3a1b96766c9d5c9845f8baacbbf88978db9c3f49 (patch)
parent016d938cec703a6d0062377ae8001c8bc7532073 (diff)
Configuration: fixed bugs in building of OpenSSL and Gettext
Until now, the 'RPATH' variable (specifying where to look for shared libraries) wasn't being set in the 'libcrypto' library of OpenSSL (it was only set for the 'libssl' library). Also, Gettext used the host Emacs for some operations during installation that could cause the following crash (because we are giving priority to local libraries, which the host Emacs doesn't recognize): emacs: /BDIR/libcrypto.so.1.1: version `OPENSSL_1_1_1b' not found (required by /lib64/libk5crypto.so.3) With this commit both these bugs have been fixed: 1) Patchelf is run on the 'libcrypto' library also and 2) we pass the '--without-emacs' configuration option to the configure script of Gettext. These bugs were found by Elham Saremi.
1 files changed, 5 insertions, 4 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index fb378b8..0d114db 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -743,9 +743,10 @@ $(ibidir)/openssl-$(openssl-version): $(ibidir)/perl-$(perl-version) \
--with-zlib-include=$(idir)/include, \
-j$(numthreads), , ./config )
- # Manually insert RPATH inside the OpenSSL library.
+ # Manually insert RPATH inside the two created libraries.
if [ -f $(ibdir)/patchelf ]; then
- patchelf --set-rpath $(ildir) $(ildir)/libssl.so; \
+ patchelf --set-rpath $(ildir) $(ildir)/libssl.so
+ patchelf --set-rpath $(ildir) $(ildir)/libcrypto.so
# Bug 58263 (https://savannah.nongnu.org/bugs/?58263): In OpenSSL
@@ -946,8 +947,8 @@ $(ibidir)/gettext-$(gettext-version): \
$(call import-source, $(gettext-url), $(gettext-checksum))
- $(call gbuild, gettext-$(gettext-version), static,, \
- V=1 -j$(numthreads))
+ $(call gbuild, gettext-$(gettext-version), static, \
+ --without-emacs, V=1 -j$(numthreads))
echo "GNU gettext $(gettext-version)" > $@
$(ibidir)/git-$(git-version): \