[SCM] mpeg2dec/master: Update 65_arm-test-with-compiler to fix FTBFS with latest ARM changes
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Sun Jul 1 21:39:14 UTC 2012
The following commit has been merged in the master branch:
commit c3eee743fa7244383bfc999713a3792f896bea1f
Author: Loïc Minier <lool at dooz.org>
Date: Sun Jul 1 23:38:58 2012 +0200
Update 65_arm-test-with-compiler to fix FTBFS with latest ARM changes
Update patch 65_arm-test-with-compiler to only set ARCH_ARM when
optimizations are built; ARCH_ARM is really used as a test for whether
to use ARM optimizations or not in the sources; also cleanup autotools
syntax with proper AC_LANG(C), AC_LANG_SOURCE and quoting.
diff --git a/debian/changelog b/debian/changelog
index eefc34a..907a368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mpeg2dec (0.5.1-5) unstable; urgency=low
+
+ * Update patch 65_arm-test-with-compiler to only set ARCH_ARM when
+ optimizations are built; ARCH_ARM is really used as a test for whether to
+ use ARM optimizations or not in the sources; also cleanup autotools syntax
+ with proper AC_LANG(C), AC_LANG_SOURCE and quoting.
+
+ -- Loïc Minier <lool at debian.org> Sun, 01 Jul 2012 23:35:15 +0200
+
mpeg2dec (0.5.1-4) unstable; urgency=low
* Fix ARM tests in configure.ac to check for availability of the "pld [r1]"
diff --git a/debian/patches/65_arm-test-with-compiler.patch b/debian/patches/65_arm-test-with-compiler.patch
index 0cb0ac4..a90f354 100644
--- a/debian/patches/65_arm-test-with-compiler.patch
+++ b/debian/patches/65_arm-test-with-compiler.patch
@@ -9,16 +9,22 @@
case "$host" in
i?86-* | k?-* | x86_64-* | amd64-*)
AC_DEFINE([ARCH_X86],,[x86 architecture])
-@@ -102,7 +102,7 @@
+@@ -102,8 +102,12 @@
alpha*)
AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);;
arm*)
- arm_conditional=:
-+ AC_COMPILE_IFELSE([__asm__ volatile("pld [r1]")], build_arm_opt=true, build_arm_opt=false)
- AC_DEFINE([ARCH_ARM],,[ARM architecture]);;
+- AC_DEFINE([ARCH_ARM],,[ARM architecture]);;
++ AC_LANG(C)
++ AC_COMPILE_IFELSE(
++ [AC_LANG_SOURCE([[
++ void foo(void) { __asm__ volatile("pld [r1]"); }]])],
++ build_arm_opt=true; AC_DEFINE([ARCH_ARM],,[ARM architecture]),
++ build_arm_opt=false);;
esac
elif test x"$CC" = x"tendracc"; then
-@@ -123,7 +123,7 @@
+ dnl TenDRA portability checking compiler
+@@ -123,7 +127,7 @@
esac
fi
diff --git a/debian/patches/90_autoreconf.patch b/debian/patches/90_autoreconf.patch
index 744d298..78f2e40 100644
--- a/debian/patches/90_autoreconf.patch
+++ b/debian/patches/90_autoreconf.patch
@@ -14635,7 +14635,7 @@
if test x"$ac_cv_try_cflags_ok" = x"yes"; then
OPT_CFLAGS="$TRY_CFLAGS"
else
-@@ -5140,16 +4938,21 @@
+@@ -5140,17 +4938,28 @@
fi;;
alpha*)
@@ -14646,25 +14646,32 @@
;;
arm*)
- arm_conditional=:
--
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_ARM
++ ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-+__asm__ volatile("pld r1")
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ARCH_ARM
++ void foo(void) { __asm__ volatile("pld [r1]"); }
_ACEOF
+-;;
+if ac_fn_c_try_compile "$LINENO"; then :
-+ build_arm_opt=true
++ build_arm_opt=true;
++$as_echo "#define ARCH_ARM /**/" >>confdefs.h
++
+else
+ build_arm_opt=false
+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+$as_echo "#define ARCH_ARM /**/" >>confdefs.h
- ;;
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;;
esac
elif test x"$CC" = x"tendracc"; then
-@@ -5163,15 +4966,11 @@
+ TENDRA=yes
+@@ -5163,15 +4972,11 @@
case "$host" in
sparc-sun-solaris*)
TRY_CFLAGS="$OPT_CFLAGS -xCC -fast -xO5"
@@ -14683,7 +14690,7 @@
/* end confdefs.h. */
int
-@@ -5182,35 +4981,15 @@
+@@ -5182,35 +4987,15 @@
return 0;
}
_ACEOF
@@ -14723,7 +14730,7 @@
if test x"$ac_cv_try_cflags_ok" = x"yes"; then
OPT_CFLAGS="$TRY_CFLAGS"
else
-@@ -5219,7 +4998,7 @@
+@@ -5219,7 +5004,7 @@
esac
fi
@@ -14732,7 +14739,7 @@
ARCH_ARM_TRUE=
ARCH_ARM_FALSE='#'
else
-@@ -5228,2663 +5007,1969 @@
+@@ -5228,2663 +5013,1969 @@
fi
@@ -14758,16 +14765,7 @@
- IFS="$lt_save_ifs"
- ;;
- esac
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}as; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_AS+:} false; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- enable_shared=yes
-fi
-
@@ -14791,12 +14789,22 @@
- IFS="$lt_save_ifs"
- ;;
- esac
-+ if test -n "$AS"; then
-+ ac_cv_prog_AS="$AS" # Let the user override the test.
++case $host in
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
++set dummy ${ac_tool_prefix}as; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_AS+:} false; then :
++ $as_echo_n "(cached) " >&6
else
- enable_static=yes
-fi
-
++ if test -n "$AS"; then
++ ac_cv_prog_AS="$AS" # Let the user override the test.
++else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
@@ -15063,12 +15071,12 @@
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_DLLTOOL"; then
-+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
++ if test -n "$ac_ct_DLLTOOL"; then
++ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
@@ -15173,7 +15181,17 @@
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
-- fi
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
+ fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
@@ -15206,17 +15224,6 @@
- fi
- done
- IFS="$lt_save_ifs"
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
+done
done
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
@@ -15993,13 +16000,6 @@
-done
-done
-IFS=$as_save_IFS
--
--fi
--fi
--AS=$ac_cv_prog_AS
--if test -n "$AS"; then
-- { echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6; }
+ for ac_prog in fgrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -16031,7 +16031,7 @@
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
-+
+
+ $ac_path_FGREP_found && break 3
+ done
+ done
@@ -16040,14 +16040,16 @@
+ if test -z "$ac_cv_path_FGREP"; then
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
++else
+ ac_cv_path_FGREP=$FGREP
fi
-
++
+ fi
-+fi
+ fi
+-AS=$ac_cv_prog_AS
+-if test -n "$AS"; then
+- { echo "$as_me:$LINENO: result: $AS" >&5
+-echo "${ECHO_T}$AS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
@@ -16058,7 +16060,7 @@
+
+
+
-
++
+
+
+
@@ -16076,18 +16078,13 @@
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+ with_gnu_ld=no
fi
--if test -z "$ac_cv_prog_AS"; then
-- ac_ct_AS=$AS
-- # Extract the first word of "as", so it can be a program name with args.
--set dummy as; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
-+
+
+-
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
@@ -16123,30 +16120,23 @@
+elif test "$with_gnu_ld" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
- else
-- if test -n "$ac_ct_AS"; then
-- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
-+fi
+ fi
+-if test -z "$ac_cv_prog_AS"; then
+- ac_ct_AS=$AS
+- # Extract the first word of "as", so it can be a program name with args.
+-set dummy as; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_AS="as"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
+- if test -n "$ac_ct_AS"; then
+- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
@@ -16168,7 +16158,22 @@
+ fi
+ done
+ IFS="$lt_save_ifs"
-+else
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_AS="as"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
fi
fi
@@ -18925,7 +18930,7 @@
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -7894,25 +6979,25 @@
+@@ -7894,25 +6985,25 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18958,7 +18963,7 @@
fi
-@@ -7921,10 +7006,10 @@
+@@ -7921,10 +7012,10 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -18973,7 +18978,7 @@
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -7934,25 +7019,25 @@
+@@ -7934,25 +7025,25 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -19006,7 +19011,7 @@
fi
if test "x$ac_ct_RANLIB" = x; then
-@@ -7960,12 +7045,8 @@
+@@ -7960,12 +7051,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -19021,7 +19026,7 @@
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
-@@ -7974,123 +7055,12 @@
+@@ -7974,123 +7061,12 @@
RANLIB="$ac_cv_prog_RANLIB"
fi
@@ -19146,7 +19151,7 @@
# Determine commands to create old-style static archives.
old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-@@ -8100,515 +7070,58 @@
+@@ -8100,515 +7076,58 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -19671,7 +19676,7 @@
# If no C compiler was specified, use CC.
-@@ -8621,3987 +7134,2872 @@
+@@ -8621,3987 +7140,2872 @@
compiler=$CC
@@ -26090,7 +26095,7 @@
/* end confdefs.h. */
int
-@@ -12612,63 +10010,49 @@
+@@ -12612,63 +10016,49 @@
return 0;
}
_ACEOF
@@ -26190,7 +26195,7 @@
/* end confdefs.h. */
int
-@@ -12679,11163 +10063,2770 @@
+@@ -12679,11163 +10069,2770 @@
return 0;
}
_ACEOF
@@ -39533,7 +39538,7 @@
-@@ -23861,195 +12852,48 @@
+@@ -23861,195 +12858,48 @@
124/488) name="$name, LP64 (standard 64bit unixish)" ;;
124/448) name="$name, LLP64 (unusual 64bit unixish)" ;;
124/*) name="$name (unusual int32 model)" ;;
@@ -39760,7 +39765,7 @@
fi # shortcircut to system "stdint.h"
-@@ -24060,8 +12904,8 @@
+@@ -24060,8 +12910,8 @@
ac_cv_stdint_message="using $CC"
fi
@@ -39771,7 +39776,7 @@
# ----------------- DONE inttypes.h checks START header -------------
ac_config_commands="$ac_config_commands $ac_stdint_h"
-@@ -24071,16 +12915,12 @@
+@@ -24071,16 +12921,12 @@
@@ -39793,7 +39798,7 @@
/* end confdefs.h. */
int
-@@ -24140,55 +12980,29 @@
+@@ -24140,55 +12986,29 @@
return 0;
}
_ACEOF
@@ -39859,7 +39864,7 @@
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
-@@ -24197,39 +13011,16 @@
+@@ -24197,39 +13017,16 @@
#endif
_ACEOF
@@ -39902,7 +39907,7 @@
case $ac_cv_c_inline in
inline | yes) ;;
-@@ -24247,15 +13038,11 @@
+@@ -24247,15 +13044,11 @@
esac
if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
@@ -39921,7 +39926,7 @@
/* end confdefs.h. */
int
-@@ -24269,35 +13056,15 @@
+@@ -24269,35 +13062,15 @@
return 0;
}
_ACEOF
@@ -39961,7 +39966,7 @@
if test x"$ac_cv_always_inline" = x"yes"; then
cat >>confdefs.h <<_ACEOF
#define inline __attribute__ ((__always_inline__))
-@@ -24305,15 +13072,11 @@
+@@ -24305,15 +13078,11 @@
fi
fi
@@ -39980,7 +39985,7 @@
/* end confdefs.h. */
int
-@@ -24324,531 +13087,823 @@
+@@ -24324,531 +13093,823 @@
return 0;
}
_ACEOF
@@ -40040,7 +40045,7 @@
else
cat > conftest.c <<EOF
-#line 24374 "configure"
-+#line 13113 "configure"
++#line 13119 "configure"
int foo (int a)
{
a = __builtin_expect (a, 10);
@@ -41215,7 +41220,7 @@
int
main ()
{
-@@ -24857,348 +13912,279 @@
+@@ -24857,348 +13918,279 @@
return 0;
}
_ACEOF
@@ -41775,7 +41780,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -25206,3372 +14192,2839 @@
+@@ -25206,3372 +14198,2839 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -47599,7 +47604,7 @@
ac_stdint=$tmp/_stdint.h
echo "#ifndef" $_ac_stdint_h >$ac_stdint
-@@ -28921,50 +17374,15 @@
+@@ -28921,50 +17380,15 @@
#endif
STDINT_EOF
if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
@@ -47653,7 +47658,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -28982,12 +17400,7 @@
+@@ -28982,12 +17406,7 @@
q
}
s/.*/./; q'`
@@ -47667,7 +47672,7 @@
rm -f $ac_stdint_h
mv $ac_stdint $ac_stdint_h
fi
-@@ -28997,11 +17410,13 @@
+@@ -28997,11 +17416,13 @@
done # for ac_tag
@@ -47683,7 +47688,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -29021,6 +17436,10 @@
+@@ -29021,6 +17442,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
--
mpeg2dec packaging
More information about the pkg-multimedia-commits
mailing list