From 297d4661482aca2bcba3c279da06a7361b11368f Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 8 Aug 2020 18:53:30 +0200 Subject: media-sound/toolame: Fix building under -fno-common Closes: https://bugs.gentoo.org/706758 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert --- .../toolame/files/toolame-02l-Makefile.patch | 70 ++++++++++++++++++++++ .../toolame/files/toolame-02l-fno-common.patch | 20 +++++++ media-sound/toolame/files/toolame-02l-gentoo.diff | 69 --------------------- media-sound/toolame/toolame-02l-r4.ebuild | 22 +++---- 4 files changed, 99 insertions(+), 82 deletions(-) create mode 100644 media-sound/toolame/files/toolame-02l-Makefile.patch create mode 100644 media-sound/toolame/files/toolame-02l-fno-common.patch delete mode 100644 media-sound/toolame/files/toolame-02l-gentoo.diff (limited to 'media-sound/toolame') diff --git a/media-sound/toolame/files/toolame-02l-Makefile.patch b/media-sound/toolame/files/toolame-02l-Makefile.patch new file mode 100644 index 000000000000..28009555d858 --- /dev/null +++ b/media-sound/toolame/files/toolame-02l-Makefile.patch @@ -0,0 +1,70 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,3 @@ +- +-CC = gcc +- + c_sources = \ + common.c \ + encode.c \ +@@ -26,29 +23,8 @@ + + OBJ = $(c_sources:.c=.o) + +-#Uncomment this if you want to do some profiling/debugging +-#PG = -g -pg +-PG = -fomit-frame-pointer +- +-# Optimize flag. 3 is about as high as you can sanely go with GCC3.2. +-OPTIM = -O3 +- + # These flags are pretty much mandatory +-REQUIRED = -DNDEBUG -DINLINE=inline +- +-#pick your architecture +-ARCH = -march=pentium +-#Possible x86 architectures +-#gcc3.2 => i386, i486, i586, i686, pentium, pentium-mmx +-# pentiumpro, pentium2, pentium3, pentium4, k6, k6-2, k6-3, +-# athlon, athlon-tbird, athlon-4, athlon-xp and athlon-mp. +- +-#TWEAK the hell out of the compile. Some of these are real dodgy +-# and will cause program instability +-#TWEAKS = -finline-functions -fexpensive-optimizations -ffast-math \ +-# -malign-double \ +-# -mfancy-math-387 -funroll-loops -funroll-all-loops -pipe \ +-# -fschedule-insns2 -fno-strength-reduce ++REQUIRED = -DNDEBUG -DINLINE= + + #Set a stack of warnings to overcome my atrocious coding style . MFC. + WARNINGS = -Wall +@@ -56,7 +32,7 @@ + + NEW_02L_FIXES = -DNEWENCODE -DNEWATAN + +-CC_SWITCHES = $(OPTIM) $(REQUIRED) $(ARCH) $(PG) $(TWEAKS) $(WARNINGS) $(NEW_02L_FIXES) ++CC_SWITCHES = $(CFLAGS) $(CPPFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES) + + PGM = toolame + +@@ -75,16 +51,16 @@ + $(CC) $(CC_SWITCHES) -c $< -o $@ + + $(PGM): $(OBJ) Makefile +- $(CC) $(PG) -o $(PGM) $(OBJ) $(LIBS) ++ $(CC) $(LDFLAGS) -o $(PGM) $(OBJ) $(LIBS) + + clean: +- -rm $(OBJ) $(DEP) ++ -rm $(OBJ) $(DEP) 2>/dev/null + + megaclean: +- -rm $(OBJ) $(DEP) $(PGM) \#*\# *~ ++ -rm $(OBJ) $(DEP) $(PGM) \#*\# *~ 2>/dev/null + + distclean: +- -rm $(OBJ) $(DEP) $(PGM) \#* *~ gmon.out gprof* core *shit* *.wav *.mp2 *.c.* *.mp2.* *.da *.h.* *.d *.mp3 *.pcm *.wav logfile ++ -rm $(OBJ) $(DEP) $(PGM) \#* *~ gmon.out gprof* core *shit* *.wav *.mp2 *.c.* *.mp2.* *.da *.h.* *.d *.mp3 *.pcm *.wav logfile 2>/dev/null + + tags: TAGS + diff --git a/media-sound/toolame/files/toolame-02l-fno-common.patch b/media-sound/toolame/files/toolame-02l-fno-common.patch new file mode 100644 index 000000000000..c414324785bb --- /dev/null +++ b/media-sound/toolame/files/toolame-02l-fno-common.patch @@ -0,0 +1,20 @@ +--- a/common.c ++++ b/common.c +@@ -19,6 +19,8 @@ + * + ***********************************************************************/ + ++options glopts; ++ + char *mode_names[4] = { "stereo", "j-stereo", "dual-ch", "single-ch" }; + char *version_names[2] = { "MPEG-2 LSF", "MPEG-1" }; + +--- a/options.h ++++ b/options.h +@@ -19,5 +19,5 @@ + } + options; + +-options glopts; ++extern options glopts; + #endif diff --git a/media-sound/toolame/files/toolame-02l-gentoo.diff b/media-sound/toolame/files/toolame-02l-gentoo.diff deleted file mode 100644 index f96020f0a815..000000000000 --- a/media-sound/toolame/files/toolame-02l-gentoo.diff +++ /dev/null @@ -1,69 +0,0 @@ ---- toolame-02l/Makefile 2003-03-02 08:07:02.000000000 +0100 -+++ toolame-02l/Makefile.new 2003-04-14 14:00:10.000000000 +0200 -@@ -1,6 +1,3 @@ -- --CC = gcc -- - c_sources = \ - common.c \ - encode.c \ -@@ -26,37 +23,16 @@ - - OBJ = $(c_sources:.c=.o) - --#Uncomment this if you want to do some profiling/debugging --#PG = -g -pg --PG = -fomit-frame-pointer -- --# Optimize flag. 3 is about as high as you can sanely go with GCC3.2. --OPTIM = -O3 -- - # These flags are pretty much mandatory - REQUIRED = -DNDEBUG -DINLINE=inline - --#pick your architecture --ARCH = -march=pentium --#Possible x86 architectures --#gcc3.2 => i386, i486, i586, i686, pentium, pentium-mmx --# pentiumpro, pentium2, pentium3, pentium4, k6, k6-2, k6-3, --# athlon, athlon-tbird, athlon-4, athlon-xp and athlon-mp. -- --#TWEAK the hell out of the compile. Some of these are real dodgy --# and will cause program instability --#TWEAKS = -finline-functions -fexpensive-optimizations -ffast-math \ --# -malign-double \ --# -mfancy-math-387 -funroll-loops -funroll-all-loops -pipe \ --# -fschedule-insns2 -fno-strength-reduce -- - #Set a stack of warnings to overcome my atrocious coding style . MFC. - WARNINGS = -Wall - WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls - - NEW_02L_FIXES = -DNEWENCODE -DNEWATAN - --CC_SWITCHES = $(OPTIM) $(REQUIRED) $(ARCH) $(PG) $(TWEAKS) $(WARNINGS) $(NEW_02L_FIXES) -+CC_SWITCHES = $(CFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES) - - PGM = toolame - -@@ -75,16 +51,16 @@ - $(CC) $(CC_SWITCHES) -c $< -o $@ - - $(PGM): $(OBJ) Makefile -- $(CC) $(PG) -o $(PGM) $(OBJ) $(LIBS) -+ $(CC) $(LDFLAGS) -o $(PGM) $(OBJ) $(LIBS) - - clean: -- -rm $(OBJ) $(DEP) -+ -rm $(OBJ) $(DEP) 2>/dev/null - - megaclean: -- -rm $(OBJ) $(DEP) $(PGM) \#*\# *~ -+ -rm $(OBJ) $(DEP) $(PGM) \#*\# *~ 2>/dev/null - - distclean: -- -rm $(OBJ) $(DEP) $(PGM) \#* *~ gmon.out gprof* core *shit* *.wav *.mp2 *.c.* *.mp2.* *.da *.h.* *.d *.mp3 *.pcm *.wav logfile -+ -rm $(OBJ) $(DEP) $(PGM) \#* *~ gmon.out gprof* core *shit* *.wav *.mp2 *.c.* *.mp2.* *.da *.h.* *.d *.mp3 *.pcm *.wav logfile 2>/dev/null - - tags: TAGS - diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild index fea144e8c601..659ebf40b047 100644 --- a/media-sound/toolame/toolame-02l-r4.ebuild +++ b/media-sound/toolame/toolame-02l-r4.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic toolchain-funcs +EAPI=7 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder" HOMEPAGE="http://www.planckenergy.com" @@ -11,25 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" PATCHES=( - "${FILESDIR}/${P}-gentoo.diff" - "${FILESDIR}/${P}-uint.patch" - "${FILESDIR}/${P}-uint32_t.patch" + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-uint.patch + "${FILESDIR}"/${P}-uint32_t.patch + "${FILESDIR}"/${P}-fno-common.patch ) -src_prepare() { - # fix #571774 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - +src_configure() { append-lfs-flags tc-export CC - - default } src_install() { dobin ${PN} - dodoc README HISTORY FUTURE html/* text/* + dodoc -r README HISTORY FUTURE html/. text/. } -- cgit v1.2.3-65-gdbad