diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-02-05 08:03:39 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-02-05 08:12:31 +0100 |
| commit | c88e18440588f579aebc9dd9e6a227822db8844a (patch) | |
| tree | 63a0600f19690a362e7805d5cfc0fc04481785b8 /patches/SDL_mixer-1.2.11 | |
| parent | 016a4b4d9ae1a03d3cf345a0322e4ad277764524 (diff) | |
| download | ptxdist-c88e18440588f579aebc9dd9e6a227822db8844a.tar.gz ptxdist-c88e18440588f579aebc9dd9e6a227822db8844a.tar.xz | |
[sdl_mixer] add options cleanup configure flags
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/SDL_mixer-1.2.11')
| -rwxr-xr-x | patches/SDL_mixer-1.2.11/autogen.sh | 3 | ||||
| -rw-r--r-- | patches/SDL_mixer-1.2.11/fix-cross-compiling.diff | 39 | ||||
| -rw-r--r-- | patches/SDL_mixer-1.2.11/series | 1 |
3 files changed, 43 insertions, 0 deletions
diff --git a/patches/SDL_mixer-1.2.11/autogen.sh b/patches/SDL_mixer-1.2.11/autogen.sh new file mode 100755 index 000000000..fb1a35ab9 --- /dev/null +++ b/patches/SDL_mixer-1.2.11/autogen.sh @@ -0,0 +1,3 @@ + +./autogen.sh + diff --git a/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff b/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff new file mode 100644 index 000000000..0e3399f56 --- /dev/null +++ b/patches/SDL_mixer-1.2.11/fix-cross-compiling.diff @@ -0,0 +1,39 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Subject: fix cross-compiling issue + +use AC_COMPILE_IFELSE instead of AC_TRY_RUN + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> + +--- + configure.in | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -417,15 +417,17 @@ if test x$enable_music_flac = xyes; then + LIBS_SAVED="$LIBS" + LIBS="-lFLAC" + AC_MSG_CHECKING([for libflac so-name version >= $libflac_ver]) +- AC_TRY_RUN([ ++ AC_COMPILE_IFELSE([ + #include "FLAC/export.h" +-#include "stdio.h" ++ ++#ifndef FLAC_API_VERSION_CURRENT ++#error no version ++#endif ++#if FLAC_API_VERSION_CURRENT < $libflac_ver ++#error too old ++#endif + int main( int argc, char *argv[] ) { +-#if defined(FLAC_API_VERSION_CURRENT) && (FLAC_API_VERSION_CURRENT >= $libflac_ver) + return 0; +-#else +- return 1; +-#endif + } + ], have_flac_ver=yes, have_flac_ver=no) + LIBS="$LIBS_SAVED" diff --git a/patches/SDL_mixer-1.2.11/series b/patches/SDL_mixer-1.2.11/series index 30ae80700..98808fa07 100644 --- a/patches/SDL_mixer-1.2.11/series +++ b/patches/SDL_mixer-1.2.11/series @@ -1 +1,2 @@ fix-parallel-build.diff +fix-cross-compiling.diff |