diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-cluster/charliecloud/files | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'sys-cluster/charliecloud/files')
| -rw-r--r-- | sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch deleted file mode 100644 index 07e72b2fbd3e..000000000000 --- a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bae9f01ed5ad0ef5d6c0b48cbc1a7fde73ae45ae Mon Sep 17 00:00:00 2001 -From: Oliver Freyermuth <o.freyermuth@googlemail.com> -Date: Mon, 15 Jul 2019 18:36:24 +0200 -Subject: [PATCH] test/Makefile: Remove hardcoded call to gcc, error out if - CC=icc. - ---- - test/Makefile | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/test/Makefile b/test/Makefile -index 97a9316b..7c28ce2a 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -10,7 +10,7 @@ images_eg := $(sort $(wildcard ../examples/*/*/Build)) \ - $(sort $(wildcard ../examples/*/*/Docker_Pull)) \ - $(sort $(wildcard ../examples/*/*/Docker_Pull.*)) - images := $(images_ch) $(images_eg) --sotests := sotest/bin/sotest sotest/lib/libsotest.so.1.0 -+sotests := check-no-icc sotest/bin/sotest sotest/lib/libsotest.so.1.0 - - # Favor embedded Bats, if installed, over system Bats. - export PATH := $(CURDIR)/bats/bin:$(PATH) -@@ -76,13 +76,18 @@ sotest/bin/sotest: sotest/sotest - sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0 - cp -a $^ $@ - --# We hardcode gcc here because some other compilers (hello, Intel) link the -+# We exclude icc here because it links the - # resulting binaries with extra shared libraries that are then not copied into - # the container. (Issue #227.) - -+check-no-icc: -+ifeq ($(patsubst %icc,,$(lastword $(CC))),) -+ $(error ICC not supported since it overlinks extra shared libraries) -+endif -+ - sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0 -- gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^ -+ $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^ - sotest/libsotest.so.1.0: sotest/libsotest.c -- gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^ -+ $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^ - ln -f -s libsotest.so.1.0 sotest/libsotest.so - ln -f -s libsotest.so.1.0 sotest/libsotest.so.1 |