commit: cfbf63b4f3849bd447d93415f2b760d779fa9f16 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Jun 21 04:33:34 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Jun 21 04:33:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfbf63b4
media-sound/chuck: fixed hardcoded toolchain Closes: https://bugs.gentoo.org/724756 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/chuck/chuck-1.4.1.1.ebuild | 4 +- .../chuck/files/chuck-1.4.1.1-makefile.patch | 50 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/media-sound/chuck/chuck-1.4.1.1.ebuild b/media-sound/chuck/chuck-1.4.1.1.ebuild index 67ca0bc1a185..7f3e4f502a22 100644 --- a/media-sound/chuck/chuck-1.4.1.1.ebuild +++ b/media-sound/chuck/chuck-1.4.1.1.ebuild @@ -25,14 +25,14 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch - "${FILESDIR}"/${PN}-1.4.0.0-makefile.patch + "${FILESDIR}"/${P}-makefile.patch ) compile_backend() { backend=$1 pushd "${S}/src" &>/dev/null || die einfo "Compiling against ${backend}" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" linux-${backend} + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend} mv chuck{,-${backend}} || die emake clean popd &>/dev/null || die diff --git a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch new file mode 100644 index 000000000000..98147cf9a81f --- /dev/null +++ b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch @@ -0,0 +1,50 @@ +diff --git a/src/core/makefile.x/makefile.alsa b/src/core/makefile.x/makefile.alsa +index 5694257..577dd91 100644 +--- a/src/core/makefile.x/makefile.alsa ++++ b/src/core/makefile.x/makefile.alsa +@@ -1,4 +1,4 @@ + +-CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ ++CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC + LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread + +diff --git a/src/core/makefile.x/makefile.jack b/src/core/makefile.x/makefile.jack +index 86b2511..442708b 100644 +--- a/src/core/makefile.x/makefile.jack ++++ b/src/core/makefile.x/makefile.jack +@@ -1,4 +1,4 @@ + +-CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ ++CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC + LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread + +diff --git a/src/makefile b/src/makefile +index f52f0c2..310991a 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -76,11 +76,11 @@ CK_VERSION=1.4.1.1 + + + ########################### COMPILATION TOOLS ################################## +-LEX=flex +-YACC=bison +-CC=gcc +-CXX=g++ +-LD=g++ ++LEX?=flex ++YACC?=bison ++CC?=gcc ++CXX?=g++ ++LD?=g++ + + + ############################# COMPILER FLAGS ################################### +@@ -92,8 +92,6 @@ endif + + ifneq ($(CHUCK_DEBUG),) + CFLAGS+= -g +-else +-CFLAGS+= -O3 + endif + + ifneq ($(USE_64_BIT_SAMPLE),)
