diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2008-09-25 10:52:18 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-09-25 10:52:18 +0000 |
| commit | 2cac5a4b33a16c8ce06ce3593c53022a6b815993 (patch) | |
| tree | 12c0ee88a9b90335b77de0d166e09f932db93f7d /packages/liboil | |
| parent | 559773acb2a0d7cec0e48511a8b29cebe4ba237e (diff) | |
| parent | 0b81567828ef0d0faf043f08c8bc83ff47746a7c (diff) | |
| download | openembedded-2cac5a4b33a16c8ce06ce3593c53022a6b815993.tar.gz | |
merge of '8f2834d1d878c2216e0ae7674e3ab70dcfdef7e1'
and 'eb29a45193648ce5a1e591048cb7ee4555a08217'
Diffstat (limited to 'packages/liboil')
| -rw-r--r-- | packages/liboil/liboil-0.3.15/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/liboil/liboil-0.3.15/autotools.patch | 46 | ||||
| -rw-r--r-- | packages/liboil/liboil_0.3.15.bb | 6 |
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 } |