summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2020-12-27 15:59:46 +0100
committerNiels Möller <nisse@lysator.liu.se>2020-12-27 15:59:46 +0100
commitd56503602134442832e73bc40a657954d3f8db8f (patch)
treeaef4ec8be7371ac9586050a506c080b9695cbcc7
parent08ac9e1e9337d4a7fb34ddd94f5e9e369d8d148b (diff)
downloadnettle-fat-build-by-default.tar.gz
Enable fat build by default.fat-build-by-default
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac4
3 files changed, 10 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac52ee38..57bbc04f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build/x86-64:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- ./.bootstrap &&
- ./configure --disable-static --enable-fat --disable-documentation && make -j4 &&
+ ./configure --disable-static --disable-documentation && make -j4 &&
make check -j4 &&
make check-fat
tags:
@@ -26,7 +26,7 @@ build/mini-gmp:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- ./.bootstrap &&
- ./configure --disable-documentation --enable-mini-gmp && make -j4 &&
+ ./configure --disable-documentation --disable-fat --enable-mini-gmp && make -j4 &&
make check -j4
tags:
- shared
@@ -128,7 +128,7 @@ Debian.cross.x86:
- export CC_FOR_BUILD="gcc"
- export CC="$host-gcc"
- ./.bootstrap &&
- CFLAGS="-O2 -g" ./configure --build=$build --host=$host --enable-fat --disable-documentation && make -j4 &&
+ CFLAGS="-O2 -g" ./configure --build=$build --host=$host --disable-documentation && make -j4 &&
make check -j4
tags:
- shared
@@ -154,7 +154,7 @@ Debian.cross.x86:
- export CC_FOR_BUILD="gcc"
- export CC="$host-gcc"
- ./.bootstrap
- - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host
+ - ./configure --disable-static --disable-documentation --build=$build --host=$host
- make -j$(nproc)
- make -j$(nproc) check
- make -j$(nproc) check-fat
diff --git a/ChangeLog b/ChangeLog
index 2c70f387..6ad199a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-27 Niels Möller <nisse@lysator.liu.se>
+
+ * configure.ac: Enable fat build by default.
+
2020-12-26 Niels Möller <nisse@lysator.liu.se>
* NEWS: News entries for Nettle-3.7.
diff --git a/configure.ac b/configure.ac
index fbb05e19..763df3b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,8 @@ AC_ARG_ENABLE(documentation,
AC_HELP_STRING([--disable-documentation], [Omit building and installing the documentation. (default=auto)]),,
[enable_documentation=auto])
-AC_ARG_ENABLE(fat, AC_HELP_STRING([--enable-fat], [Enable fat library build (default=no)]),,
- [enable_fat=no])
+AC_ARG_ENABLE(fat, AC_HELP_STRING([--disable-fat], [Disable fat library build]),,
+ [enable_fat=yes])
AC_ARG_ENABLE(arm-neon,
AC_HELP_STRING([--enable-arm-neon], [Enable ARM Neon assembly. (default=auto)]),,