[oe-commits] woglinde : Revert "liboil: update to latest liboil, needed for latest schroedinger"
GIT User account
git at amethyst.openembedded.net
Tue Mar 31 09:00:21 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7dcbd8502cefdae8c5a9f759294e46b5758c35f9
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7dcbd8502cefdae8c5a9f759294e46b5758c35f9
Author: woglinde <heinold at inf.fu-berlin.de>
Date: Tue Mar 31 10:56:05 2009 +0200
Revert "liboil: update to latest liboil, needed for latest schroedinger"
This reverts commit f25144e99b769aac83bcde613edf684441bbef27.
---
conf/checksums.ini | 18 +++++++++++++++---
recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch | 11 +++++++++++
.../{files => liboil-0.3.15}/autotools.patch | 0
recipes/liboil/{liboil.inc => liboil_0.3.10.bb} | 7 ++-----
recipes/liboil/{liboil.inc => liboil_0.3.11.bb} | 5 +++--
recipes/liboil/{liboil.inc => liboil_0.3.14.bb} | 5 ++++-
recipes/liboil/liboil_0.3.15.bb | 17 +++++++++++++++--
recipes/liboil/liboil_0.3.16.bb | 3 ---
recipes/liboil/{liboil.inc => liboil_0.3.9.bb} | 7 ++-----
9 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index bb833c8..6ce967d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13398,13 +13398,25 @@ sha256=bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
md5=461d7097bf47864b872085a94ff94e10
sha256=01453d561255b5fcb361997904752860e4f8c6b9742f290578a44615fcc94356
+[http://liboil.freedesktop.org/download/liboil-0.3.10.tar.gz]
+md5=770f656bca8166dab33b322d5886a4bf
+sha256=4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c
+
+[http://liboil.freedesktop.org/download/liboil-0.3.11.tar.gz]
+md5=65ce3266be385d0c7cd9a1157433332f
+sha256=deb6530d40ecad2b849d68912500e6d03bab4ac63de7a97340d05af1d7cf0ad4
+
+[http://liboil.freedesktop.org/download/liboil-0.3.14.tar.gz]
+md5=7a9f719e50656b795c06c0167012a84f
+sha256=a40c09db6ee24e03aa81f58329a57e45e55462a2e0f619b3796d4bf942c23f2f
+
[http://liboil.freedesktop.org/download/liboil-0.3.15.tar.gz]
md5=11dd39b1ca13ce2e0618d4df8303f137
sha256=ae5e3b03a72dd4d12accbe7a6022e4e8570fa309defec9846341384d0a657fd4
-[http://liboil.freedesktop.org/download/liboil-0.3.16.tar.gz]
-md5=febb1d9f9bc4c440fcf622dc90f8b6b7
-sha256=009115b0fc888dfe28903fecfe806707c544ccad6554ebabdeb3a1d88ec1e9d
+[http://liboil.freedesktop.org/download/liboil-0.3.9.tar.gz]
+md5=5d139b1fb16f0e93f0c84290ad2aaff8
+sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90
[http://www.balabit.com/downloads/files/libol/0.3/libol-0.3.16.tar.gz]
md5=1f29be3f4bcddb5b2f3d965e78f04006
diff --git a/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch b/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch
new file mode 100644
index 0000000..49485e3
--- /dev/null
+++ b/recipes/liboil/liboil-0.3.11/ppc-detect-fpu.patch
@@ -0,0 +1,11 @@
+--- /m4/orig-as-gcc-inline-assembly.m4 2007-03-17 04:03:30.000000000 +0200
++++ /m4/as-gcc-inline-assembly.m4 2007-11-20 12:20:24.000000000 +0200
+@@ -38,7 +38,7 @@
+ [
+ AC_MSG_CHECKING([if compiler supports FPU instructions on PowerPC])
+
+- AC_TRY_COMPILE([], [__asm__ ("fadd 0,0,0"::) ], [flag_ok=yes], [flag_ok=no])
++ AC_TRY_COMPILE([], [double x = 0; __asm__ ("fadd 0,0,0"::"f" (x):"32") ], [flag_ok=yes], [flag_ok=no])
+
+ if test "X$flag_ok" = Xyes ; then
+ $1
diff --git a/recipes/liboil/files/autotools.patch b/recipes/liboil/liboil-0.3.15/autotools.patch
similarity index 100%
rename from recipes/liboil/files/autotools.patch
rename to recipes/liboil/liboil-0.3.15/autotools.patch
diff --git a/recipes/liboil/liboil.inc b/recipes/liboil/liboil_0.3.10.bb
similarity index 61%
copy from recipes/liboil/liboil.inc
copy to recipes/liboil/liboil_0.3.10.bb
index 728941f..94471a2 100644
--- a/recipes/liboil/liboil.inc
+++ b/recipes/liboil/liboil_0.3.10.bb
@@ -2,13 +2,10 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for va
HOMEPAGE = "http://liboil.freedesktop.org/"
LICENSE = "various"
-DEPENDS = "glib-2.0"
-
-SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
- "
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
inherit autotools pkgconfig
do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
diff --git a/recipes/liboil/liboil.inc b/recipes/liboil/liboil_0.3.11.bb
similarity index 78%
copy from recipes/liboil/liboil.inc
copy to recipes/liboil/liboil_0.3.11.bb
index 728941f..44b4b5e 100644
--- a/recipes/liboil/liboil.inc
+++ b/recipes/liboil/liboil_0.3.11.bb
@@ -1,14 +1,15 @@
DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
HOMEPAGE = "http://liboil.freedesktop.org/"
LICENSE = "various"
+PR ="r2"
DEPENDS = "glib-2.0"
SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
- "
+ file://ppc-detect-fpu.patch;patch=1"
inherit autotools pkgconfig
do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
diff --git a/recipes/liboil/liboil.inc b/recipes/liboil/liboil_0.3.14.bb
similarity index 69%
copy from recipes/liboil/liboil.inc
copy to recipes/liboil/liboil_0.3.14.bb
index 728941f..ebbe6cf 100644
--- a/recipes/liboil/liboil.inc
+++ b/recipes/liboil/liboil_0.3.14.bb
@@ -2,6 +2,9 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for va
HOMEPAGE = "http://liboil.freedesktop.org/"
LICENSE = "various"
+# The configure script seems to have bogus checks, so let's not make it the default
+DEFAULT_PREFERENCE = "-1"
+
DEPENDS = "glib-2.0"
SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
@@ -10,5 +13,5 @@ SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
inherit autotools pkgconfig
do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
diff --git a/recipes/liboil/liboil_0.3.15.bb b/recipes/liboil/liboil_0.3.15.bb
index dfc66fe..338121a 100644
--- a/recipes/liboil/liboil_0.3.15.bb
+++ b/recipes/liboil/liboil_0.3.15.bb
@@ -1,3 +1,16 @@
-require liboil.inc
+DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs."
+HOMEPAGE = "http://liboil.freedesktop.org/"
+LICENSE = "various"
+PR = "r2"
-SRC_URI =+ "file://autotools.patch;patch=1"
+DEPENDS = "glib-2.0"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
+ file://autotools.patch;patch=1 \
+ "
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/liboil/liboil_0.3.16.bb b/recipes/liboil/liboil_0.3.16.bb
deleted file mode 100644
index dfc66fe..0000000
--- a/recipes/liboil/liboil_0.3.16.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require liboil.inc
-
-SRC_URI =+ "file://autotools.patch;patch=1"
diff --git a/recipes/liboil/liboil.inc b/recipes/liboil/liboil_0.3.9.bb
similarity index 61%
rename from recipes/liboil/liboil.inc
rename to recipes/liboil/liboil_0.3.9.bb
index 728941f..94471a2 100644
--- a/recipes/liboil/liboil.inc
+++ b/recipes/liboil/liboil_0.3.9.bb
@@ -2,13 +2,10 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for va
HOMEPAGE = "http://liboil.freedesktop.org/"
LICENSE = "various"
-DEPENDS = "glib-2.0"
-
-SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
- "
+SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz"
inherit autotools pkgconfig
do_stage() {
- autotools_stage_all
+ autotools_stage_all
}
More information about the Openembedded-commits
mailing list