Fix build with glibc 2.26: https://github.com/tpaviot/oce/issues/675 Patch copied from upstream source repository: https://github.com/tpaviot/oce/commit/aa1321e68cc004e3debe38d79ae74581a617c767 From aa1321e68cc004e3debe38d79ae74581a617c767 Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Mon, 18 Dec 2017 11:27:55 +0100 Subject: [PATCH] fix build errors with glibc 2.26+ due to missing xlocale.h (issue #675) * check for the presence of xlocale.h via cmake * remove related logic from Standard_CLocaleSentry.hxx --- CMakeLists.txt | 1 + src/Standard/Standard_CLocaleSentry.hxx | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b782b4101..50e9500b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -616,6 +616,7 @@ if (NOT WIN32) # compilation anywhere in OCE include(CheckIncludeFile) check_include_file(strings.h HAVE_STRINGS_H) + check_include_file(xlocale.h HAVE_XLOCALE_H) include(CheckIncludeFileCXX) check_include_file_cxx(mm_malloc.h HAVE_MM_MALLOC_H) check_include_file_cxx(atomic.h OCE_HAVE_ATOMIC_H) diff --git a/src/Standard/Standard_CLocaleSentry.hxx b/src/Standard/Standard_CLocaleSentry.hxx index 2b226e7f3..1a4c1dadc 100644 --- a/src/Standard/Standard_CLocaleSentry.hxx +++ b/src/Standard/Standard_CLocaleSentry.hxx @@ -20,21 +20,6 @@ #include -#ifndef HAVE_XLOCALE_H - //! "xlocale.h" available in Mac OS X and glibc (Linux) for a long time as an extension - //! and become part of POSIX since '2008. - //! Notice that this is impossible to test (_POSIX_C_SOURCE >= 200809L) - //! since POSIX didn't declared such identifier. - #if defined(__APPLE__) - #define HAVE_XLOCALE_H - #endif - - //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler. - #if defined(_GNU_SOURCE) && !defined(__ANDROID__) - #define HAVE_XLOCALE_H - #endif -#endif // ifndef HAVE_LOCALE_H - #ifdef HAVE_XLOCALE_H #include #endif -- 2.15.1 636a8786e33496a3e7aa2010399915afd25900f'>root/gnu/tests/messaging.scm
AgeCommit message (Expand)Author
2021-09-26tests: Reduce boilerplate for users of 'system-test-runner'....* gnu/tests/audio.scm, gnu/tests/base.scm, gnu/tests/ci.scm, gnu/tests/cups.scm, gnu/tests/databases.scm, gnu/tests/desktop.scm, gnu/tests/dict.scm, gnu/tests/docker.scm, gnu/tests/file-sharing.scm, gnu/tests/ganeti.scm, gnu/tests/guix.scm, gnu/tests/ldap.scm, gnu/tests/linux-modules.scm, gnu/tests/mail.scm, gnu/tests/messaging.scm, gnu/tests/monitoring.scm, gnu/tests/networking.scm, gnu/tests/nfs.scm, gnu/tests/package-management.scm, gnu/tests/reconfigure.scm, gnu/tests/rsync.scm, gnu/tests/security-token.scm, gnu/tests/singularity.scm, gnu/tests/ssh.scm, gnu/tests/telephony.scm, gnu/tests/version-control.scm, gnu/tests/virtualization.scm, gnu/tests/web.scm: Remove (mkdir #$output) (chdir #$output) and pass #$output as argument to 'system-test-runner'. Ludovic Courtès
2021-09-25tests: Adjust to SRFI-64 as found in Guile 3.0.7....In Guile 3.0.7, 'test-runner-current' is set to #f upon 'test-end'. Consequently, the previous strategy, where we'd call 'test-runner-current' after 'test-end', no longer works. Instead, set the test runner in each test right before 'test-begin'. * gnu/build/marionette.scm (system-test-runner): New procedure. * gnu/tests/audio.scm (run-mpd-test): Replace (exit (= ...)) idiom by (test-runner-current (system-test-runner)). * gnu/tests/base.scm (run-basic-test) (run-cleanup-test, run-mcron-test, run-nss-mdns-test): Likewise. * gnu/tests/ci.scm (run-laminar-test): Likewise. * gnu/tests/cups.scm (run-cups-test): Likewise. * gnu/tests/databases.scm (run-memcached-test) (run-postgresql-test, run-mysql-test): Likewise. * gnu/tests/desktop.scm (run-elogind-test): Likewise. * gnu/tests/dict.scm (run-dicod-test): Likewise. * gnu/tests/docker.scm (run-docker-test): Likewise. (run-docker-system-test): Likewise. * gnu/tests/file-sharing.scm (run-transmission-daemon-test): Likewise. * gnu/tests/ganeti.scm (run-ganeti-test): Likewise. * gnu/tests/guix.scm (run-guix-build-coordinator-test): Likewise. (run-guix-data-service-test): Likewise. * gnu/tests/ldap.scm (run-ldap-test): Likewise. * gnu/tests/linux-modules.scm (run-loadable-kernel-modules-test-base): Likewise. * gnu/tests/mail.scm (run-opensmtpd-test) (run-exim-test, run-dovecot-test, run-getmail-test): Likewise. * gnu/tests/messaging.scm (run-xmpp-test) (run-bitlbee-test, run-quassel-test): Likewise. * gnu/tests/monitoring.scm (run-prometheus-node-exporter-server-test) (run-zabbix-server-test): Likewise. * gnu/tests/networking.scm (run-inetd-test, run-openvswitch-test) (run-dhcpd-test, run-tor-test, run-iptables-test, run-ipfs-test): Likewise. * gnu/tests/nfs.scm (run-nfs-test) (run-nfs-server-test, run-nfs-root-fs-test): Likewise. * gnu/tests/package-management.scm (run-nix-test): Likewise. * gnu/tests/reconfigure.scm (run-switch-to-system-test) (run-upgrade-services-test, run-install-bootloader-test): Likewise. * gnu/tests/rsync.scm (run-rsync-test): Likewise. * gnu/tests/security-token.scm (run-pcscd-test): Likewise. * gnu/tests/singularity.scm (run-singularity-test): Likewise. * gnu/tests/ssh.scm (run-ssh-test): Likewise. * gnu/tests/telephony.scm (run-jami-test): Likewise. * gnu/tests/version-control.scm (run-cgit-test): Likewise. (run-git-http-test, run-gitolite-test, run-gitile-test): Likewise. * gnu/tests/virtualization.scm (run-libvirt-test, run-childhurd-test): Likewise. * gnu/tests/web.scm (run-webserver-test, run-php-fpm-test) (run-hpcguix-web-server-test, run-tailon-test, run-patchwork-test): Likewise. Ludovic Courtès