diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2015-01-10 20:16:37 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2015-01-10 20:16:37 +0000 |
| commit | 403699b0e5b14dbe29716aaa1bbfb4f6f92200c6 (patch) | |
| tree | 0136b53f7b2cb0ace03ff355f488dc1bb9b846c6 /audio/flac/files/patch-configure | |
| parent | Uses blaslapack.mk. (diff) | |
Update to FLAC 1.3.1. No significant user-visible changes.
Drop iconv option again and always require iconv for flac.
Notes
Notes:
svn path=/head/; revision=376724
Diffstat (limited to 'audio/flac/files/patch-configure')
| -rw-r--r-- | audio/flac/files/patch-configure | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure index f4d604e92fac..e83412207e15 100644 --- a/audio/flac/files/patch-configure +++ b/audio/flac/files/patch-configure @@ -1,14 +1,31 @@ - -$FreeBSD$ - ---- configure.orig 2013-05-27 10:11:54.740045000 +0200 -+++ configure 2013-06-09 18:15:53.000000000 +0200 -@@ -19807,7 +19807,7 @@ else +--- configure.orig 2014-11-27 02:46:58 UTC ++++ configure +@@ -17885,7 +17885,7 @@ _ACEOF + + asm_optimisation=no + case "$host_cpu" in +- x86_64) ++ amd64|x86_64) + if test $ac_cv_sizeof_voidp = 4 ; then + # This must be a 32 bit user space running on 64 bit kernel so treat + # this as ia32. +@@ -19874,8 +19874,8 @@ if test "x$debug" = xtrue; then + CFLAGS="-g $CFLAGS" + else CPPFLAGS="-DNDEBUG $CPPFLAGS" - if test "x$GCC" = xyes; then - if test "x$user_cflags" = x; then -- CFLAGS="-O3 -funroll-loops -Wall -W -Winline" -+ CFLAGS="-Wall -W" - fi - fi +- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') +- CFLAGS="-O3 -funroll-loops $CFLAGS" ++ #CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') ++ #CFLAGS="-O3 -funroll-loops $CFLAGS" fi + + +@@ -20051,7 +20051,7 @@ rm -f core conftest.err conftest.$ac_obj + + fi + +- if test "x$asm_optimisation$sse_os" = "xyesyes" ; then ++ if false test "x$asm_optimisation$sse_os" = "xyesyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5 + $as_echo_n "checking if $CC accepts -msse2... " >&6; } + ac_add_cflags__old_cflags="$CFLAGS" |