diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-25 12:30:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-25 12:30:58 +0000 |
| commit | f98bbbba774cd1fa5c4d320639617218bc74b987 (patch) | |
| tree | 68c58f168d088ebf545b68bb977805da1172c1e0 | |
| parent | 0d9c1c3ef0cb4159fa65bd7452f40b7fd6fe20da (diff) | |
| parent | ceaf5dc7a03b36eeebd7ce989c4b414b5f706732 (diff) | |
merge of '4ff3a98585b83fc6b2da66523e59d09c1ce39b20'
and '6950cb0adadcf0fa171ec2fdd0751373a16fa294'
| -rw-r--r-- | packages/liboil/liboil-0.3.15/autotools.patch | 35 | ||||
| -rw-r--r-- | packages/liboil/liboil_0.3.15.bb | 6 |
2 files changed, 6 insertions, 35 deletions
diff --git a/packages/liboil/liboil-0.3.15/autotools.patch b/packages/liboil/liboil-0.3.15/autotools.patch index bbd4cbb250..53501e3991 100644 --- a/packages/liboil/liboil-0.3.15/autotools.patch +++ b/packages/liboil/liboil-0.3.15/autotools.patch @@ -1,8 +1,8 @@ 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 @@ ++++ liboil-0.3.15/configure.ac 2008-09-25 13:44:18.633758105 +0200 +@@ -187,16 +187,6 @@ true) fi @@ -13,34 +13,9 @@ Index: liboil-0.3.15/configure.ac - #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 +-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 + if test "x$HAVE_ASM_BLOCKS" = "xyes" diff --git a/packages/liboil/liboil_0.3.15.bb b/packages/liboil/liboil_0.3.15.bb index 2021451ddb..338121ac66 100644 --- a/packages/liboil/liboil_0.3.15.bb +++ b/packages/liboil/liboil_0.3.15.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." HOMEPAGE = "http://liboil.freedesktop.org/" LICENSE = "various" -PR = "r1" +PR = "r2" DEPENDS = "glib-2.0" @@ -11,10 +11,6 @@ SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \ inherit autotools pkgconfig -EXTRA_OECONF = "\ - ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \ - " - do_stage() { autotools_stage_all } |