From 061d3ec62707a526a83482e57d202a66f9d776cd Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Tue, 23 Aug 2022 19:34:39 +0200 Subject: [PATCH] Test the -m32 and -m64 compiler flags before use Fixes: https://github.com/haampie/libtree/issues/78 Signed-off-by: Ismael Luceno --- tests/05_32_bits/Makefile | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/05_32_bits/Makefile b/tests/05_32_bits/Makefile index 2c0bece..5628f42 100644 --- a/tests/05_32_bits/Makefile +++ b/tests/05_32_bits/Makefile @@ -3,7 +3,7 @@ LD_LIBRARY_PATH= -.PHONY: clean +.PHONY: clean check all: check @@ -21,11 +21,21 @@ exe64: lib64/libx.so exe32: lib32/libx.so echo 'extern int a(); int _start(){return a();}' | $(CC) -m32 "-Wl,-rpath,$(CURDIR)/lib64" "-Wl,-rpath,$(CURDIR)/lib32" -o $@ -nostdlib -x c - -Llib32 -lx -check: exe32 exe64 - ../../libtree exe32 - ../../libtree exe64 - clean: rm -rf lib32 lib64 exe* CURDIR ?= $(.CURDIR) + +test-flag = 2>/dev/null ${CC} -E /dev/null +test-end = && echo y || echo n +support-m32 != ${test-flag} -m32 ${test-end} +support-m64 != ${test-flag} -m64 ${test-end} + +check${support-m32:y=}:: exe32 + ../../libtree exe32 + +check${support-m64:y=}:: exe64 + ../../libtree exe64 + +check${support-m32:n=} check${support-m64:n=}:: + @echo WARNING: test skipped at ${CURDIR} d4'>commitdiff
AgeCommit message (Expand)Author
2021-05-07gnu: conky: Enable WLAN support....* gnu/packages/conky.scm (conky)[arguments]: Add "-DBUILD_WLAN=ON" to #:configure-flags. [inputs]: Add wireless-tools. Tobias Geerinckx-Rice
2021-05-06gnu: conky: Run tests....There were always tests. * gnu/packages/conky.scm (conky)[arguments]: Build and run tests. Tobias Geerinckx-Rice
2021-05-06gnu: conky: Update to 1.12.2....* gnu/packages/conky.scm (conky): Update to 1.12.2. Tobias Geerinckx-Rice
2020-09-30gnu: Fix package references....* gnu/packages/algebra.scm (iml)[inputs]: Correctly refer to package inputs. * gnu/packages/astronomy.scm (xplanet), * gnu/packages/audio.scm (redkite, libaudec, lv2lint, lv2toweb), * gnu/packages/bioconductor.scm (r-cummerbund), * gnu/packages/chicken.scm (chicken), * gnu/packages/conky.scm (conky), * gnu/packages/cran.scm (r-latex2exp), * gnu/packages/crates-io.scm (rust-rgb), * gnu/packages/databases.scm (mariadb), * gnu/packages/diffoscope.scm (reprotest), * gnu/packages/file-systems.scm (glusterfs), * gnu/packages/finance.scm (electron-cash), * gnu/packages/games.scm (rinutils, ksudoku, kdiamond, kigo), * gnu/packages/geo.scm (grass), * gnu/packages/gnome.scm (libmediaart, gnome-contacts, geoclue), * gnu/packages/gnucash.scm (aqbanking), * gnu/packages/image.scm (mtpaint), * gnu/packages/kde-internet.scm (kopete, ktorrent), * gnu/packages/kde-utils.scm (kmousetool, kmouth, kronometer), * gnu/packages/linphone.scm (liblinphone), * gnu/packages/maths.scm (ppl), * gnu/packages/mercury.scm (mercury-minimal), * gnu/packages/music.scm (bjumblr, bschaffl, lsp-plugins, spectacle-analyzer, helm, tap-lv2, wolf-shaper, shiru-lv2), * gnu/packages/networking.scm (restinio), * gnu/packages/prolog.scm (swi-prolog), * gnu/packages/python-web.scm (gunicorn), * gnu/packages/python-xyz.scm (python-docusign-esign), * gnu/packages/ruby.scm (ruby-cucumber, ruby_version, ruby-addressable), * gnu/packages/sagemath.scm (python-cypari2), * gnu/packages/skarnet.scm (s6-linux-init), * gnu/packages/vpn.scm (sshuttle), * gnu/packages/web.scm (libcyaml), * gnu/packages/xdisorg.scm (kbdd), * gnu/packages/xorg.scm (xpra): Same. Efraim Flashner
2020-07-28gnu: conky: Update to 1.11.6....* gnu/packages/conky.scm (conky): Update to 1.11.6. Tobias Geerinckx-Rice