* disable optimization fiddling and just honor CFLAGS

* don't bother with automake
This commit is contained in:
naddy 2010-04-01 22:12:47 +00:00
parent 40cfd19ee0
commit b058820615
4 changed files with 60 additions and 20 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2009/06/20 14:56:18 martynas Exp $
# $OpenBSD: Makefile,v 1.15 2010/04/01 22:12:47 naddy Exp $
COMMENT= command-line MPEG audio decoder and player
DISTNAME= madplay-0.15.2b
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= audio
HOMEPAGE= http://mad.sourceforge.net/
@ -25,8 +25,7 @@ WANTLIB= c m sndio z
USE_LIBTOOL= Yes
SEPARATE_BUILD= simple
AUTOCONF_VERSION=2.59
AUTOMAKE_VERSION=1.8
CONFIGURE_STYLE= autoconf automake
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --without-esd
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_am,v 1.1 2009/03/28 16:26:46 martynas Exp $
--- Makefile.am.orig Thu Mar 26 23:43:32 2009
+++ Makefile.am Thu Mar 26 23:44:31 2009
@@ -45,7 +45,7 @@ default_audio = audio.c audio.h \
audio_raw.c audio_snd.c audio_wave.c
extra_audio = audio_alsa.c audio_carbon.c audio_empeg.c \
audio_esd.c audio_jaguar.c audio_nas.c audio_oss.c \
- audio_qnx.c audio_sun.c audio_win32.c
+ audio_qnx.c audio_sndio.c audio_sun.c audio_win32.c
getopt_sources = getopt.c getopt.h getopt1.c

View File

@ -0,0 +1,28 @@
$OpenBSD: patch-Makefile_in,v 1.1 2010/04/01 22:12:47 naddy Exp $
--- Makefile.in.orig Thu Apr 1 23:33:04 2010
+++ Makefile.in Thu Apr 1 23:33:52 2010
@@ -117,6 +117,7 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/audio_nas.Po ./$(DEPDIR)/audio_null.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/audio_oss.Po ./$(DEPDIR)/audio_qnx.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/audio_raw.Po ./$(DEPDIR)/audio_snd.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/audio_sndio.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/audio_sun.Po ./$(DEPDIR)/audio_wave.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/audio_win32.Po ./$(DEPDIR)/crc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/filter.Po ./$(DEPDIR)/getopt.Po \
@@ -302,7 +303,7 @@ default_audio = audio.c audio.h \
extra_audio = audio_alsa.c audio_carbon.c audio_empeg.c \
audio_esd.c audio_jaguar.c audio_nas.c audio_oss.c \
- audio_qnx.c audio_sun.c audio_win32.c
+ audio_qnx.c audio_sndio.c audio_sun.c audio_win32.c
getopt_sources = getopt.c getopt.h getopt1.c
madplay_SOURCES = global.h madplay.c $(getopt_sources) gettext.h \
@@ -481,6 +482,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_qnx.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_raw.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_snd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_sndio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_sun.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_wave.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_win32.Po@am__quote@

View File

@ -1,7 +1,23 @@
$OpenBSD: patch-configure_ac,v 1.1 2009/03/28 16:26:46 martynas Exp $
--- configure.ac.orig Mon Feb 23 23:34:53 2004
+++ configure.ac Tue Mar 24 12:56:28 2009
@@ -314,6 +314,13 @@ fi
$OpenBSD: patch-configure_ac,v 1.2 2010/04/01 22:12:47 naddy Exp $
--- configure.ac.orig Mon Feb 23 22:34:53 2004
+++ configure.ac Thu Apr 1 23:08:53 2010
@@ -72,6 +72,7 @@ debug=""
optimize=""
profile=""
+if false; then
set -- $CFLAGS
CFLAGS=""
@@ -138,6 +139,7 @@ then
: #? optimize="$optimize -finline-functions"
fi
fi
+fi
dnl Internationalization support.
@@ -314,6 +316,13 @@ fi
if test "$audio" = unknown
then
@ -15,3 +31,12 @@ $OpenBSD: patch-configure_ac,v 1.1 2009/03/28 16:26:46 martynas Exp $
AC_EGREP_CPP(yes, [
# include <sys/soundcard.h>
# if defined(OPEN_SOUND_SYSTEM) || defined(UNIX_SOUND_SYSTEM) || \
@@ -480,7 +489,7 @@ AC_HELP_STRING([--disable-debugging],
debug=""
if test "$GCC" = yes
then
- optimize="$optimize -fomit-frame-pointer"
+ : optimize="$optimize -fomit-frame-pointer"
fi
;;
esac