| 1 |
commit: 2c437afd20857d4652078f520141077aa5f91533 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Fri Apr 30 15:43:44 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 22:17:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c437afd |
| 7 |
|
| 8 |
app-misc/cdctl: Respect CFLAGS, fix tc-directly |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/722394 |
| 11 |
Closes: https://bugs.gentoo.org/779952 |
| 12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
app-misc/cdctl/cdctl-0.16.ebuild | 7 ++++++- |
| 16 |
app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch | 14 +++++++------- |
| 17 |
2 files changed, 13 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild |
| 20 |
index e552ac85380..29c33f701e5 100644 |
| 21 |
--- a/app-misc/cdctl/cdctl-0.16.ebuild |
| 22 |
+++ b/app-misc/cdctl/cdctl-0.16.ebuild |
| 23 |
@@ -3,7 +3,7 @@ |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
|
| 27 |
-inherit autotools |
| 28 |
+inherit autotools toolchain-funcs |
| 29 |
|
| 30 |
DESCRIPTION="Utility to control your cd/dvd drive" |
| 31 |
HOMEPAGE="http://cdctl.sourceforge.net/" |
| 32 |
@@ -20,3 +20,8 @@ src_prepare() { |
| 33 |
default |
| 34 |
eautoreconf |
| 35 |
} |
| 36 |
+ |
| 37 |
+src_configure() { |
| 38 |
+ tc-export CC |
| 39 |
+ default |
| 40 |
+} |
| 41 |
|
| 42 |
diff --git a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch |
| 43 |
index f6f4ad3abdc..ed338d7d168 100644 |
| 44 |
--- a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch |
| 45 |
+++ b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch |
| 46 |
@@ -1,9 +1,9 @@ |
| 47 |
---- cdctl/Makefile.in |
| 48 |
-+++ cdctl/Makefile.in |
| 49 |
-@@ -1,8 +1,8 @@ |
| 50 |
- CC=gcc |
| 51 |
+--- a/Makefile.in |
| 52 |
++++ b/Makefile.in |
| 53 |
+@@ -1,8 +1,7 @@ |
| 54 |
+-CC=gcc |
| 55 |
-CFLAGS=-Wall -g |
| 56 |
-+CFLAGS:=-Wall -g |
| 57 |
++CFLAGS += -Wall |
| 58 |
BINS=cdctl sndreset |
| 59 |
OBJS=cdctl.o version.o ioctls.o iso_header.o |
| 60 |
-DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS |
| 61 |
@@ -11,7 +11,7 @@ |
| 62 |
# NOTE: all man pages are installed in $(mandir)/man1 -- see install-mans |
| 63 |
MANS=cdctl.1 |
| 64 |
MOS=cdctl.mo |
| 65 |
-@@ -22,6 +22,8 @@ |
| 66 |
+@@ -22,6 +21,8 @@ INSTALL = @INSTALL@ |
| 67 |
INSTALL_DIR = $(INSTALL) -d |
| 68 |
INSTALL_DATA = $(INSTALL) -m 644 |
| 69 |
|
| 70 |
@@ -20,7 +20,7 @@ |
| 71 |
all: $(BINS) |
| 72 |
|
| 73 |
cdctl: $(OBJS) |
| 74 |
-@@ -35,25 +37,21 @@ |
| 75 |
+@@ -35,25 +36,21 @@ iso_header.o: iso_header.c |
| 76 |
indent: |
| 77 |
indent -kr -cdb -sc *.c |
Archives