summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2008-09-24 18:52:44 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2008-09-24 18:52:44 +0000
commit2f619f93a43b7ec5108c51c516d22882be18e6e7 (patch)
tree198cce3cf746a1bf7e52e898e229ff8c591d06c7 /packages
parent05bc62adb05c2821ec7608f0513c149edc30952b (diff)
liboil: fix compilation for armv4 and softfloat
* add patch with softfloat configure option from cacao * do the same in the recipe * bump PR
Diffstat (limited to 'packages')
-rw-r--r--packages/liboil/liboil-0.3.15/.mtn2git_empty0
-rw-r--r--packages/liboil/liboil-0.3.15/autotools.patch46
-rw-r--r--packages/liboil/liboil_0.3.15.bb6
3 files changed, 52 insertions, 0 deletions
diff --git a/packages/liboil/liboil-0.3.15/.mtn2git_empty b/packages/liboil/liboil-0.3.15/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/liboil/liboil-0.3.15/.mtn2git_empty
diff --git a/packages/liboil/liboil-0.3.15/autotools.patch b/packages/liboil/liboil-0.3.15/autotools.patch
new file mode 100644
index 0000000000..bbd4cbb250
--- /dev/null
+++ b/packages/liboil/liboil-0.3.15/autotools.patch
@@ -0,0 +1,46 @@
+Index: liboil-0.3.15/configure.ac
+===================================================================
+--- liboil-0.3.15.orig/configure.ac 2008-07-01 06:45:53.000000000 +0200
++++ liboil-0.3.15/configure.ac 2008-09-24 20:37:24.963143501 +0200
+@@ -187,15 +187,33 @@
+ true)
+ fi
+
+-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
+- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
+- [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"],
+- true)
+- #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"],
+- # [VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp"],
+- # true)
++dnl macro taken from cacao
++dnl check if softfloat should be used
++
++AC_DEFUN([AC_CHECK_SOFTFLOAT],[
++AC_MSG_CHECKING(whether softfloat should be used)
++AC_ARG_ENABLE([softfloat],
++ [AS_HELP_STRING(--enable-softfloat,use softfloat [[default=no]])],
++ [case "${enableval}" in
++ yes)
++ ENABLE_SOFTFLOAT=yes
++ ;;
++ *)
++ ENABLE_SOFTFLOAT=no
++ ;;
++ esac],
++ [ENABLE_SOFTFLOAT=no])
++AC_MSG_RESULT(${ENABLE_SOFTFLOAT})
++
++if test x"${ENABLE_SOFTFLOAT}" = "xyes"; then
++ VFP_CFLAGS="$VFP_CFLAGS -mfloat-abi=softfp"
++else
++ VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"
+ fi
+-AC_SUBST(VFP_CFLAGS)
++AC_SUBST([VFP_CFLAGS])
++])
++
++AC_CHECK_SOFTFLOAT
+
+ #AS_COMPILER_FLAG(["-fasm-blocks"], HAVE_ASM_BLOCKS=yes, HAVE_ASM_BLOCKS=no)
+ HAVE_ASM_BLOCKS=no
diff --git a/packages/liboil/liboil_0.3.15.bb b/packages/liboil/liboil_0.3.15.bb
index d6a29f0c0f..2021451ddb 100644
--- a/packages/liboil/liboil_0.3.15.bb
+++ b/packages/liboil/liboil_0.3.15.bb
@@ -1,14 +1,20 @@
DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
HOMEPAGE = "http://liboil.freedesktop.org/"
LICENSE = "various"
+PR = "r1"
DEPENDS = "glib-2.0"
SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+ file://autotools.patch;patch=1 \
"
inherit autotools pkgconfig
+EXTRA_OECONF = "\
+ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
+ "
+
do_stage() {
autotools_stage_all
}