summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rühsen <tim.ruehsen@gmx.de>2018-06-28 12:59:52 +0200
committerTim Rühsen <tim.ruehsen@gmx.de>2018-06-29 09:46:57 +0200
commite4fec2150646e157933ab901079a21c3f8efa4a1 (patch)
tree3b34ddd4a874717d295e00eb7fc9f82156dcc574
parente6cd90221e06b4f4957dacf8614fc74328efa483 (diff)
downloadgnutls-tmp-year2038.tar.gz
Add gnulib module year2038 to ensure a 64bit time_ttmp-year2038
./configure needs TIME_T_32_BIT_OK=yes to continue. See also https://gitlab.com/gnutls/gnutls/merge_requests/688 https://gitlab.com/gnutls/gnutls/issues/498 Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--bootstrap.conf2
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ced5cecfb..e2bb629101 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -408,8 +408,10 @@ Fedora.x86:
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_X86_BUILD
script:
- ./bootstrap && mkdir -p build && cd build &&
- CC="ccache gcc -m32" PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig/ ../configure --disable-gcc-warnings --host=i686-redhat-linux --target=i686-redhat-linux
- --libdir=/usr/lib --disable-cxx --disable-non-suiteb-curves --enable-seccomp-tests --disable-full-test-suite --disable-doc --disable-guile &&
+ CC="ccache gcc -m32" PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig/ TIME_T_32_BIT_OK=yes
+ ../configure --disable-gcc-warnings --host=i686-redhat-linux --target=i686-redhat-linux
+ --libdir=/usr/lib --disable-cxx --disable-non-suiteb-curves --enable-seccomp-tests
+ --disable-full-test-suite --disable-doc --disable-guile &&
make -j$(nproc) && make check -j$(nproc) SKIP_DATEFUDGE_CHECK=1 &&
make pic-check
tags:
diff --git a/bootstrap.conf b/bootstrap.conf
index b67a531aa7..1cc036f31a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -27,7 +27,7 @@ local_gl_dir=gl/override/
# Reproduce by: gnulib-tool --import --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lock-tests --avoid=lseek-tests --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strndup strtok_r strverscmp sys_socket sys_stat time_r unistd vasprintf vsnprintf warnings
gnulib_modules="
-alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strdup-posix strndup strtok_r strverscmp sys_socket sys_stat sys_types time_r unistd valgrind-tests vasprintf vsnprintf warnings
+alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strdup-posix strndup strtok_r strverscmp sys_socket sys_stat sys_types time_r unistd valgrind-tests vasprintf vsnprintf warnings year2038
"
unistring_modules="