summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-06-10 11:09:37 +0200
committerDavid Seifert <soap@gentoo.org>2020-06-10 11:09:37 +0200
commit3573bbc04dee3c56333dab5c645ce4caaf6d0afd (patch)
tree5d68fa38837becfd4b68f88ffb7bf09aed2155ff /media-sound
parentdev-python/scikit-build: Take for python@ (diff)
downloadgentoo-3573bbc04dee3c56333dab5c645ce4caaf6d0afd.tar.gz
gentoo-3573bbc04dee3c56333dab5c645ce4caaf6d0afd.tar.bz2
gentoo-3573bbc04dee3c56333dab5c645ce4caaf6d0afd.zip
media-sound/madplay: Respect CFLAGS
Closes: https://bugs.gentoo.org/727782 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch182
-rw-r--r--media-sound/madplay/madplay-0.15.2b-r1.ebuild8
2 files changed, 187 insertions, 3 deletions
diff --git a/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch b/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch
new file mode 100644
index 00000000000..92a5a8434e3
--- /dev/null
+++ b/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch
@@ -0,0 +1,182 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,28 +36,8 @@
+
+ dnl Checks for programs.
+
+-# Work-around for autoconf 2.53 bug
+-case "$host" in
+- *-apple-darwin*)
+- : ${CPP="cc -E -traditional-cpp"}
+- ;;
+-esac
+-
+ AC_PROG_CC
+
+-if test "$GCC" = yes
+-then
+- case "$host" in
+- *-*-mingw*)
+- case "$build" in
+- *-*-cygwin*)
+- CPPFLAGS="$CPPFLAGS -mno-cygwin"
+- LDFLAGS="$LDFLAGS -mno-cygwin"
+- ;;
+- esac
+- esac
+-fi
+-
+ dnl Support for libtool.
+
+ AC_DISABLE_SHARED
+@@ -67,77 +47,7 @@
+
+ dnl Compiler options.
+
+-arch=""
+-debug=""
+-optimize=""
+-profile=""
+-
+-set -- $CFLAGS
+-CFLAGS=""
+-
+-if test "$GCC" = yes
+-then
+- CFLAGS="-Wall"
+-fi
+-
+-while test $# -gt 0
+-do
+- case "$1" in
+- -Wall)
+- if test "$GCC" = yes
+- then
+- :
+- else
+- CFLAGS="$CFLAGS $1"
+- fi
+- shift
+- ;;
+- -g)
+- debug="-g"
+- shift
+- ;;
+- -mno-cygwin)
+- shift
+- ;;
+- -m*)
+- arch="$arch $1"
+- shift
+- ;;
+- -fomit-frame-pointer)
+- shift
+- ;;
+- -O*|-f*)
+- optimize="$1"
+- shift
+- ;;
+- *)
+- CFLAGS="$CFLAGS $1"
+- shift
+- ;;
+- esac
+-done
+-
+-if test "$GCC" = yes
+-then
+- if test -z "$arch"
+- then
+- case "$host" in
+- i386-*) ;;
+- i?86-*) arch="-march=i486" ;;
+- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
+- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
+- powerpc-*) ;;
+- mips*-agenda-*) arch="-mcpu=vr4100" ;;
+- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+- esac
+- fi
+-
+- if test -n "$optimize"
+- then
+- : #? optimize="$optimize -funroll-loops"
+- : #? optimize="$optimize -finline-functions"
+- fi
+-fi
++CFLAGS="${CFLAGS} -Wall"
+
+ dnl Internationalization support.
+
+@@ -445,71 +355,8 @@
+ depend_audio="$depend_audio audio_$audio.o"
+ fi
+
+-dnl madplay options...
+-
+-AC_MSG_CHECKING([whether to enable profiling])
+-AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],
+- [generate profiling code]),
+-[
+- case "$enableval" in
+- yes) profile="-pg" ;;
+- esac
+-])
+-AC_MSG_RESULT(${enable_profiling-no})
+-
+-AC_MSG_CHECKING([whether to enable debugging])
+-AC_ARG_ENABLE(debugging, AC_HELP_STRING([--enable-debugging],
+- [enable diagnostic debugging support])
+-AC_HELP_STRING([--disable-debugging],
+- [do not enable debugging and use more optimization]),
+-[
+- case "$enableval" in
+- yes)
+- AC_DEFINE(DEBUG, 1,
+- [Define to enable diagnostic debugging support.])
+- optimize=""
+- ;;
+- no)
+- if test -n "$profile"
+- then
+- AC_MSG_ERROR([--enable-profiling and --disable-debugging are incompatible])
+- fi
+-
+- AC_DEFINE(NDEBUG, 1,
+- [Define to disable debugging assertions.])
+- debug=""
+- if test "$GCC" = yes
+- then
+- optimize="$optimize -fomit-frame-pointer"
+- fi
+- ;;
+- esac
+-])
+-AC_MSG_RESULT(${enable_debugging-default})
+-
+-case "$enable_debugging" in
+- yes) AC_CHECK_LIB(efence, malloc) ;;
+-esac
+-
+-AC_MSG_CHECKING([whether to enable experimental code])
+-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
+- [enable experimental code]),
+-[
+- case "$enableval" in
+- yes)
+- AC_DEFINE(EXPERIMENTAL, 1, [Define to enable experimental code.])
+- ;;
+- esac
+-])
+-AC_MSG_RESULT(${enable_experimental-no})
+-
+ dnl Create output files.
+
+-test -n "$arch" && CFLAGS="$CFLAGS $arch"
+-test -n "$debug" && CFLAGS="$CFLAGS $debug"
+-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
+-test -n "$profile" && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
+-
+ AC_CONFIG_FILES([Makefile msvc++/Makefile \
+ intl/Makefile po/Makefile.in m4/Makefile \
+ madplay.list])
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index c460ef1497d..8b00f0ac938 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa debug nls"
+IUSE="alsa nls"
RDEPEND="
media-libs/libid3tag:=
@@ -21,7 +21,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
-PATCHES=( "${FILESDIR}"/${PN}-macos.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-macos.patch
+ "${FILESDIR}"/${P}-fix-autoconf.patch
+)
src_prepare() {
default
@@ -31,7 +34,6 @@ src_prepare() {
src_configure() {
econf \
$(use_enable nls) \
- $(use_enable debug debugging) \
$(use_with alsa) \
--without-esd
}