From 9e6d1c176a007d6751e3acd02f96becee48ef361 Mon Sep 17 00:00:00 2001
From: Ben Cressey <bcressey@amazon.com>
Date: Sun, 6 Aug 2017 23:15:02 +0000
Subject: [PATCH] disable shared for host builds of gmp, isl, mpc, mpfr

Building these GCC dependencies as static libraries avoids the need to
provide the shared library paths at runtime, using either rpath entries
at link time or dynamic linker environment variables at runtime.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
---
 package/Makefile.in  | 2 +-
 package/gmp/gmp.mk   | 4 ++++
 package/isl/isl.mk   | 4 ++++
 package/mpc/mpc.mk   | 4 ++++
 package/mpfr/mpfr.mk | 4 ++++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 43d214bcbe..3e9036b96f 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -243,7 +243,7 @@ HOST_CPPFLAGS  = -I$(HOST_DIR)/include
 HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
 HOST_CXXFLAGS += $(HOST_CFLAGS)
-HOST_LDFLAGS  += -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib
+HOST_LDFLAGS  += -L$(HOST_DIR)/lib
 
 # host-intltool should be executed with the system perl, so we save
 # the path to the system perl, before a host-perl built by Buildroot
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 9b402767fd..fe7cf05d8e 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -14,6 +14,10 @@ GMP_CPE_ID_VENDOR = gmplib
 GMP_DEPENDENCIES = host-m4
 HOST_GMP_DEPENDENCIES = host-m4
 
+HOST_GMP_CONF_OPTS = \
+	--enable-static \
+	--disable-shared
+
 # 0001-mpz-inp_raw.c-Avoid-bit-size-overflows.patch
 GMP_IGNORE_CVES += CVE-2021-43618
 
diff --git a/package/isl/isl.mk b/package/isl/isl.mk
index ce9aaecebc..883bf3a830 100644
--- a/package/isl/isl.mk
+++ b/package/isl/isl.mk
@@ -11,4 +11,8 @@ ISL_LICENSE = MIT
 ISL_LICENSE_FILES = LICENSE
 HOST_ISL_DEPENDENCIES = host-gmp
 
+HOST_ISL_CONF_OPTS = \
+	--enable-static \
+	--disable-shared
+
 $(eval $(host-autotools-package))
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 364e4c3c85..2a93394a39 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -12,5 +12,9 @@ MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
 HOST_MPC_DEPENDENCIES = host-gmp host-mpfr
 
+HOST_MPC_CONF_OPTS = \
+	--enable-static \
+	--disable-shared
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index cd558dae0e..74080ec884 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -15,5 +15,9 @@ MPFR_DEPENDENCIES = gmp
 HOST_MPFR_DEPENDENCIES = host-gmp
 MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB)
 
+HOST_MPFR_CONF_OPTS = \
+	--enable-static \
+	--disable-shared
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-- 
2.37.2