From 4403303c76a223bbfc3254f28b1341b068e41703 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 4 Aug 2014 18:02:01 +0200 Subject: liboil: fix building for x86_64 Signed-off-by: Michael Olbrich --- ...t-check-for-assembler-options-and-add-com.patch | 29 ++++++++++++++++++++ ...0002-fix-unaligned-access-whitelist-check.patch | 22 +++++++++++++++ patches/liboil-0.3.16/autogen.sh | 1 + .../liboil-0.3.13-fix-configure.ac.diff | 28 ------------------- .../liboil-0.3.16/liboil-0.3.13-fix-configure.diff | 32 ---------------------- patches/liboil-0.3.16/series | 7 +++-- 6 files changed, 57 insertions(+), 62 deletions(-) create mode 100644 patches/liboil-0.3.16/0001-liboil-don-t-check-for-assembler-options-and-add-com.patch create mode 100644 patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch create mode 120000 patches/liboil-0.3.16/autogen.sh delete mode 100644 patches/liboil-0.3.16/liboil-0.3.13-fix-configure.ac.diff delete mode 100644 patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff (limited to 'patches/liboil-0.3.16') diff --git a/patches/liboil-0.3.16/0001-liboil-don-t-check-for-assembler-options-and-add-com.patch b/patches/liboil-0.3.16/0001-liboil-don-t-check-for-assembler-options-and-add-com.patch new file mode 100644 index 000000000..275c83ea2 --- /dev/null +++ b/patches/liboil-0.3.16/0001-liboil-don-t-check-for-assembler-options-and-add-com.patch @@ -0,0 +1,29 @@ +From: Michael Olbrich +Date: Mon, 4 Aug 2014 17:45:42 +0200 +Subject: [PATCH] liboil: don't check for assembler options and add compiler + options + +Checking for "-Wa,-mfpu=vfp" and then adding "-mfpu=vfp" os of course nonsense. + +Signed-off-by: Michael Olbrich +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a657101..38bd436 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,10 +188,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then + fi + + if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then +- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], ++ AS_COMPILER_FLAG(["-mfpu=vfp"], + [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], + true) +- #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], ++ #AS_COMPILER_FLAG(["-mfloat-abi=softfp"], + # [VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp"], + # true) + fi diff --git a/patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch b/patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch new file mode 100644 index 000000000..86f6d76df --- /dev/null +++ b/patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch @@ -0,0 +1,22 @@ +From: Michael Olbrich +Date: Mon, 4 Aug 2014 17:47:38 +0200 +Subject: [PATCH] fix unaligned access whitelist check + +Signed-off-by: Michael Olbrich +--- + m4/as-unaligned-access.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/as-unaligned-access.m4 b/m4/as-unaligned-access.m4 +index ede8bd2..3496505 100644 +--- a/m4/as-unaligned-access.m4 ++++ b/m4/as-unaligned-access.m4 +@@ -4,7 +4,7 @@ dnl check if unaligned memory access works correctly + AC_DEFUN([AS_UNALIGNED_ACCESS], [ + AC_MSG_CHECKING([if unaligned memory access works correctly]) + if test x"$as_cv_unaligned_access" = x ; then +- case $host in ++ case "$host_cpu" in + alpha*|arm*|hp*|mips*|sh*|sparc*|ia64*) + _AS_ECHO_N([(blacklisted) ]) + as_cv_unaligned_access=no diff --git a/patches/liboil-0.3.16/autogen.sh b/patches/liboil-0.3.16/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/liboil-0.3.16/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.ac.diff b/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.ac.diff deleted file mode 100644 index 2c3125757..000000000 --- a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.ac.diff +++ /dev/null @@ -1,28 +0,0 @@ -Subject: liboil: don't check for assembler options and add compiler options -From: Michael Olbrich - -Checking for "-Wa,-mfpu=vfp" and then adding "-mfpu=vfp" os of course nonsense. - -Signed-off-by: Michael Olbrich - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: liboil-0.3.15/configure.ac -=================================================================== ---- liboil-0.3.15.orig/configure.ac -+++ liboil-0.3.15/configure.ac -@@ -188,10 +188,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ - fi - - if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then -- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"], -+ AS_COMPILER_FLAG(["-mfpu=vfp"], - [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"], - true) -- #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"], -+ #AS_COMPILER_FLAG(["-mfloat-abi=softfp"], - # [VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp"], - # true) - fi diff --git a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff b/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff deleted file mode 100644 index f04595b50..000000000 --- a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff +++ /dev/null @@ -1,32 +0,0 @@ -Subject: liboil: don't check for assembler options and add compiler options -From: Michael Olbrich - -Checking for "-Wa,-mfpu=vfp" and then adding "-mfpu=vfp" os of course nonsense. - -Signed-off-by: Michael Olbrich -[mkl: ported to configure] -Singed-off-by: Marc Kleine-Budde - ---- - configure | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: liboil-0.3.16/configure -=================================================================== ---- liboil-0.3.16.orig/configure -+++ liboil-0.3.16/configure -@@ -17458,11 +17458,11 @@ fi - - if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then - -- { echo "$as_me:$LINENO: checking to see if compiler understands \"-Wa,-mfpu=vfp\"" >&5 --echo $ECHO_N "checking to see if compiler understands \"-Wa,-mfpu=vfp\"... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking to see if compiler understands \"-mfpu=vfp\"" >&5 -+echo $ECHO_N "checking to see if compiler understands \"-mfpu=vfp\"... $ECHO_C" >&6; } - - save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS "-Wa,-mfpu=vfp"" -+ CFLAGS="$CFLAGS "-mfpu=vfp"" - - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ diff --git a/patches/liboil-0.3.16/series b/patches/liboil-0.3.16/series index 49c69a04d..d5a53b3f8 100644 --- a/patches/liboil-0.3.16/series +++ b/patches/liboil-0.3.16/series @@ -1,2 +1,5 @@ -liboil-0.3.13-fix-configure.ac.diff -liboil-0.3.13-fix-configure.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-liboil-don-t-check-for-assembler-options-and-add-com.patch +0002-fix-unaligned-access-whitelist-check.patch +# a45ce1b5bbcfaf2b379d89609c26c1d1 - git-ptx-patches magic -- cgit v1.2.3