summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch39
-rw-r--r--meta/recipes-support/liboil/liboil_0.3.17.bb3
2 files changed, 41 insertions, 1 deletions
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
new file mode 100644
index 0000000000..5b7dd4e7f1
--- /dev/null
+++ b/meta/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
@@ -0,0 +1,39 @@
1From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001
2From: David Schleef <ds@schleef.org>
3Date: Fri, 8 Apr 2011 10:05:49 -0700
4Subject: [PATCH 10/10] Fix --enable-vfp flag
5
6Patch from Christophe Lyon, fixes #36084.
7---
8 configure.ac | 4 ++--
9 liboil/arm/Makefile.am | 1 +
10 2 files changed, 3 insertions(+), 2 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index 98c81fb..407d88c 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -188,8 +188,8 @@ fi
17 AC_ARG_ENABLE(vfp,
18 AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
19 enable_vfp=$enableval,enable_vfp=yes)
20-if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
21- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
22+if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
23+ AS_COMPILER_FLAG(["-mfpu=vfp"],
24 [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"],
25 true)
26 #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"],
27diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am
28index ead08ed..cd8d9fa 100644
29--- a/liboil/arm/Makefile.am
30+++ b/liboil/arm/Makefile.am
31@@ -6,4 +6,5 @@ libarm_la_SOURCES = \
32 math_vfp_asm.S
33
34 libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)
35+libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)
36
37--
381.7.6
39
diff --git a/meta/recipes-support/liboil/liboil_0.3.17.bb b/meta/recipes-support/liboil/liboil_0.3.17.bb
index 64e1ddd2f9..10a845e42f 100644
--- a/meta/recipes-support/liboil/liboil_0.3.17.bb
+++ b/meta/recipes-support/liboil/liboil_0.3.17.bb
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \
10 file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d" 10 file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d"
11 11
12DEPENDS = "glib-2.0" 12DEPENDS = "glib-2.0"
13PR = "r3" 13PR = "r4"
14 14
15SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \ 15SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \
16 file://no-tests.patch \ 16 file://no-tests.patch \
17 file://fix-unaligned-whitelist.patch \ 17 file://fix-unaligned-whitelist.patch \
18 file://0001-Fix-enable-vfp-flag.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701" 21SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701"