app-misc/cdctl: Respect CFLAGS, fix tc-directly

Closes: https://bugs.gentoo.org/722394 Closes: https://bugs.gentoo.org/779952 Signed-off-by: Jakov Smolic <[email protected]> Signed-off-by: Sam James <[email protected]>
johu · May 4, 2021 · 2c437af · 2c437af
1 parent 60d821c
commit 2c437af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Utility to control your cd/dvd drive"
 HOMEPAGE="http://cdctl.sourceforge.net/"
@@ -20,3 +20,8 @@ src_prepare() {
 	default
 	eautoreconf
 }
+
+src_configure() {
+	tc-export CC
+	default
+}
diff --git a/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.16-Makefile.in.patch
@@ -1,17 +1,17 @@
---- cdctl/Makefile.in
-+++ cdctl/Makefile.in
-@@ -1,8 +1,8 @@
- CC=gcc
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,8 +1,7 @@
+-CC=gcc
 -CFLAGS=-Wall -g
-+CFLAGS:=-Wall -g
++CFLAGS += -Wall
  BINS=cdctl sndreset
  OBJS=cdctl.o version.o ioctls.o iso_header.o
 -DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
 +DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README
  # NOTE:  all man pages are installed in $(mandir)/man1 -- see install-mans
  MANS=cdctl.1
  MOS=cdctl.mo
-@@ -22,6 +22,8 @@
+@@ -22,6 +21,8 @@ INSTALL = @INSTALL@
  INSTALL_DIR = $(INSTALL) -d
  INSTALL_DATA = $(INSTALL) -m 644
 
@@ -20,7 +20,7 @@
  all: $(BINS)
 
  cdctl: $(OBJS)
-@@ -35,25 +37,21 @@
+@@ -35,25 +36,21 @@ iso_header.o: iso_header.c
  indent:
  	indent -kr -cdb -sc *.c