diff options
-rw-r--r-- | config/companion_libs/gmp.in | 8 | ||||
-rw-r--r-- | scripts/build/companion_libs/100-gmp.sh | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in index 386caff..f156e69 100644 --- a/config/companion_libs/gmp.in +++ b/config/companion_libs/gmp.in @@ -9,18 +9,22 @@ choice config GMP_V_6_0_0 bool prompt "6.0.0a" + select GMP_5_0_2_or_later config GMP_V_5_1_3 bool prompt "5.1.3" + select GMP_5_0_2_or_later config GMP_V_5_1_1 bool prompt "5.1.1" + select GMP_5_0_2_or_later config GMP_V_5_0_2 bool prompt "5.0.2" + select GMP_5_0_2_or_later config GMP_V_5_0_1 bool @@ -40,6 +44,10 @@ config GMP_V_4_3_0 endchoice +# To disable --enable-mpbsd +config GMP_5_0_2_or_later + bool + config GMP_VERSION string # Don't remove next line diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index beb75ea..f0c96a2 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -76,6 +76,7 @@ do_gmp_backend() { local cflags local ldflags local arg + local -a extra_config for arg in "$@"; do eval "${arg// /\\ }" @@ -83,6 +84,10 @@ do_gmp_backend() { CT_DoLog EXTRA "Configuring GMP" + if [ ! "${CT_GMP_5_0_2_or_later}" = "y" ]; then + extra_config+=("--enable-mpbsd") + fi + CT_DoExecLog CFG \ CFLAGS="${cflags} -fexceptions" \ LDFLAGS="${ldflags}" \ @@ -91,10 +96,10 @@ do_gmp_backend() { --host=${host} \ --prefix="${prefix}" \ --enable-fft \ - --enable-mpbsd \ --enable-cxx \ --disable-shared \ - --enable-static + --enable-static \ + "${extra_config}" CT_DoLog EXTRA "Building GMP" CT_DoExecLog ALL make ${JOBSFLAGS} |