diff options
| author |   Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2020-03-18 15:08:52 +0300 |
|---|---|---|
| committer |   Aaron Bauman <bman@gentoo.org> | 2020-05-15 14:19:36 -0400 |
| commit | 78368340e8df47f36adcd144c744197eebadfff5 (patch) | |
| tree | f637683787ea6fc511ce52271e08a9bcffce1bcc | |
| parent | net-misc/exabgp-4.2.6: Version bump, add py37, py38 (bug 718442) (diff) | |
| download | gentoo-78368340e8df47f36adcd144c744197eebadfff5.tar.gz gentoo-78368340e8df47f36adcd144c744197eebadfff5.tar.bz2 gentoo-78368340e8df47f36adcd144c744197eebadfff5.zip | |
media-libs/nas: fix compiling on gcc 10 (#707968)
Closes: https://bugs.gentoo.org/707968
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15001
Signed-off-by: Aaron Bauman <bman@gentoo.org>
| -rw-r--r-- | media-libs/nas/files/nas-1.9.4-fno-config.patch | 42 | ||||
| -rw-r--r-- | media-libs/nas/nas-1.9.4-r2.ebuild | 7 |
2 files changed, 46 insertions, 3 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 new file mode 100644 index 000000000000..e5ce72d37d9a --- /dev/null +++ b/media-libs/nas/files/nas-1.9.4-fno-config.patch @@ -0,0 +1,42 @@ +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/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild index f83d66bb9d9a..2965f1bf3de9 100644 --- a/media-libs/nas/nas-1.9.4-r2.ebuild +++ b/media-libs/nas/nas-1.9.4-r2.ebuild @@ -35,9 +35,10 @@ DEPEND="${RDEPEND} DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO ) PATCHES=( - "${FILESDIR}"/${PN}-1.9.2-asneeded.patch - "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch - "${FILESDIR}"/${PN}-1.9.4-libfl.patch + "${FILESDIR}/${PN}-1.9.2-asneeded.patch" + "${FILESDIR}/${P}-remove-abs-fabs.patch" + "${FILESDIR}/${P}-libfl.patch" + "${FILESDIR}/${P}-fno-config.patch" ) src_prepare() { |