diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /media-libs/nas/files | |
parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) |
gentoo resync : 20.03.2022
Diffstat (limited to 'media-libs/nas/files')
-rw-r--r-- | media-libs/nas/files/nas-1.9.4-fno-config.patch | 42 | ||||
-rw-r--r-- | media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch | 36 |
2 files changed, 0 insertions, 78 deletions
diff --git a/media-libs/nas/files/nas-1.9.4-fno-config.patch b/media-libs/nas/files/nas-1.9.4-fno-config.patch deleted file mode 100644 index e5ce72d37d9a..000000000000 --- a/media-libs/nas/files/nas-1.9.4-fno-config.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f1e8e0da221152560efcb097c00539476071047c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Thu, 23 Jan 2020 13:43:12 +0100 -Subject: [PATCH] Fix building with GCC 10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 10 defaults to -fno-common and as a result raises an arror when -linking nasd: - -gcc -o nasd -O2 -fno-strict-aliasing -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -L../lib/audio -L/usr/lib64 -L/usr/lib64 dia/libdia.a dda/voxware/libvoxware.a os/libos.a -/usr/bin/ld: dia/libdia.a(lex.o): in function `$d': -lex.c:(.bss+0x48): multiple definition of `yyin'; dia/libdia.a(main.o):/builddir/build/BUILD/nas-1.9.4/server/dia/main.c:79: first defined here -collect2: error: ld returned 1 exit status - -The reason is that both lex.c (generated from lex.l) and main.c -define yyin global variable. - -This patch changes the main.c definition into a declaration. - -Signed-off-by: Petr Písař <ppisar@redhat.com> ---- - server/dia/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/dia/main.c b/server/dia/main.c -index 462e89b..9ea2a12 100644 ---- a/server/dia/main.c -+++ b/server/dia/main.c -@@ -76,7 +76,7 @@ static char *AuServerName(void); - extern char *display; - - static int restart = 0; --FILE *yyin; /* for the config parser */ -+extern FILE *yyin; /* for the config parser */ - - void - NotImplemented() --- -2.26.2 - diff --git a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch b/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch deleted file mode 100644 index 46ef6bb4610e..000000000000 --- a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 212309075d26668f6e25f30754e646952843cf61 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Tue, 28 Apr 2015 18:56:46 -0600 -Subject: [PATCH] - -On a uClibc system, the macro definitions of abs() and fabs() - cause the build to fail. Since these are specified by POSIX, it is safe to - just drop their definition. This has been tested on uClibc, glibc and musl. - -See: https://bugs.gentoo.org/show_bug.cgi?id=510766 - -Signed-off-by: Anthony G. Basile <blueness@gentoo.org> ---- - server/include/misc.h | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/server/include/misc.h b/server/include/misc.h -index 2267ae0..fb904c8 100644 ---- a/server/include/misc.h -+++ b/server/include/misc.h -@@ -71,12 +71,6 @@ typedef int Bool; - - #define min(a, b) (((a) < (b)) ? (a) : (b)) - #define max(a, b) (((a) > (b)) ? (a) : (b)) --#ifndef abs --#define abs(a) ((a) > 0 ? (a) : -(a)) --#endif --#ifndef fabs --#define fabs(a) ((a) > 0.0 ? (a) : -(a)) /* floating absolute value */ --#endif - #define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0)) - /* this assumes b > 0 */ - #define modulus(a, b, d) if (((d) = (a) % (b)) < 0) (d) += (b) --- -2.0.5 - |