diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
| commit | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch) | |
| tree | 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /www-servers/gatling/files | |
| parent | d934827bf44b7cfcf6711964418148fa60877668 (diff) | |
gentoo resync : 28.11.2020
Diffstat (limited to 'www-servers/gatling/files')
| -rw-r--r-- | www-servers/gatling/files/gatling-0.15-ar.patch | 30 | ||||
| -rw-r--r-- | www-servers/gatling/files/gatling-0.15-gcc10.patch | 38 |
2 files changed, 68 insertions, 0 deletions
diff --git a/www-servers/gatling/files/gatling-0.15-ar.patch b/www-servers/gatling/files/gatling-0.15-ar.patch new file mode 100644 index 000000000000..84b13293e426 --- /dev/null +++ b/www-servers/gatling/files/gatling-0.15-ar.patch @@ -0,0 +1,30 @@ +From 64933921d28aa96cbece18e43723117661a8056d Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sat, 28 Nov 2020 20:33:21 +0100 +Subject: [PATCH] GNUmakefile: Respect variable AR + +GNU make comes with AR predefined: +$ make -f <(echo $'.PHONY: all\nall:\n\t@echo "AR is \\"$(AR)\\"."') +AR is "ar". + +Original bug report at https://bugs.gentoo.org/756850 +--- + GNUmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 6af7b35..e6b32fe 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -195,7 +195,7 @@ dummy.c: + touch $@ + + libsocketkludge.a: libsocket libiconv dummy.o +- ar q $@ dummy.o ++ $(AR) q $@ dummy.o + -ranlib $@ + + LDLIBS+=`cat libsocket libiconv libcrypt` +-- +2.27.0 + diff --git a/www-servers/gatling/files/gatling-0.15-gcc10.patch b/www-servers/gatling/files/gatling-0.15-gcc10.patch new file mode 100644 index 000000000000..446ea5cffdec --- /dev/null +++ b/www-servers/gatling/files/gatling-0.15-gcc10.patch @@ -0,0 +1,38 @@ +From b815fc02179e8f25a6bea2bc1ee7306ffea37258 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Thu, 26 Nov 2020 16:05:26 +0100 +Subject: [PATCH] Fix build with -fno-common or GCC 10 + +--- + dirfd.c | 1 + + dirfd.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/dirfd.c b/dirfd.c +index 6a0217e..792bd29 100644 +--- a/dirfd.c ++++ b/dirfd.c +@@ -34,6 +34,7 @@ struct hashtable dc; + + #ifdef __linux__ + int rootwd; ++int ifd; + #endif + + /* initialize a hashtable as empty */ +diff --git a/dirfd.h b/dirfd.h +index cdfc4a3..a76c5d8 100644 +--- a/dirfd.h ++++ b/dirfd.h +@@ -21,7 +21,7 @@ + * given dir, and it will return the fd or -1 on error. */ + + #ifdef __linux__ +-int ifd; /* inotify fd */ ++extern int ifd; /* inotify fd */ + #endif + + struct dircacheentry { +-- +2.27.0 + |