summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-08-08 18:53:48 +0200
committerDavid Seifert <soap@gentoo.org>2020-08-08 18:53:48 +0200
commit3d368209706cb3c0731262a873d61390f1044267 (patch)
tree4b3f4e0a01969164c8c2643bb5b448aa9a921895 /media-sound/takcd
parentmedia-sound/gnomad: Fix building under -fno-common (diff)
downloadgentoo-3d368209706cb3c0731262a873d61390f1044267.tar.gz
gentoo-3d368209706cb3c0731262a873d61390f1044267.tar.bz2
gentoo-3d368209706cb3c0731262a873d61390f1044267.zip
media-sound/takcd: Fix building under -fno-common
Closes: https://bugs.gentoo.org/707042 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-sound/takcd')
-rw-r--r--media-sound/takcd/files/takcd-0.10-fno-common.patch44
-rw-r--r--media-sound/takcd/takcd-0.10-r1.ebuild8
2 files changed, 49 insertions, 3 deletions
diff --git a/media-sound/takcd/files/takcd-0.10-fno-common.patch b/media-sound/takcd/files/takcd-0.10-fno-common.patch
new file mode 100644
index 000000000000..ec97e62eea30
--- /dev/null
+++ b/media-sound/takcd/files/takcd-0.10-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/bsd_discid.c
++++ b/bsd_discid.c
+@@ -29,7 +29,7 @@
+ #include "config.h"
+
+ const char *cdrom_device=DEV_CDROM;
+-int cdrom_fd;
++extern int cdrom_fd;
+
+ int Discid_Init(void) {
+ /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
+--- a/darwin_discid.c
++++ b/darwin_discid.c
+@@ -29,7 +29,7 @@
+ #include "config.h"
+
+ const char *cdrom_device=DEV_CDROM;
+-int cdrom_fd;
++extern int cdrom_fd;
+
+ int Discid_Init(void) {
+ /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
+--- a/linux_discid.c
++++ b/linux_discid.c
+@@ -31,7 +31,7 @@
+
+ char *cdrom_device = NULL;
+
+-int cdrom_fd;
++extern int cdrom_fd;
+
+ int Discid_Init(void) {
+ /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
+--- a/sun_discid.c
++++ b/sun_discid.c
+@@ -30,7 +30,7 @@
+ #include "config.h"
+
+ const char *cdrom_device=DEV_CDROM;
+-int cdrom_fd;
++extern int cdrom_fd;
+
+ int Discid_Init(void) {
+ /* if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
diff --git a/media-sound/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild
index 154fab65024c..9bbbf1143850 100644
--- a/media-sound/takcd/takcd-0.10-r1.ebuild
+++ b/media-sound/takcd/takcd-0.10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -12,9 +12,11 @@ SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc x86"
-IUSE=""
-PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-overflow.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
src_prepare() {
default