summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2008-11-04 15:38:21 +0000
committerJoshua Lock <josh@linux.intel.com>2008-11-04 15:38:21 +0000
commit74e5d027b92d8e4df2ee85dc7f9c1e4a7523c845 (patch)
tree2ef9819163581f5279042f88df561107ec84cc24
parentfd4b88a88e494f644cd2293ab31044a8c5ab82e0 (diff)
parent8dd388cac42ef4dc7305d5d5a5b83f955d4c1f7e (diff)
downloadpoky-74e5d027b92d8e4df2ee85dc7f9c1e4a7523c845.tar.gz
Merge branch 'master' of ssh://git@git.moblin.org/poky
-rw-r--r--meta/packages/parted/parted-1.8.8/no_check.patch17
-rw-r--r--meta/packages/parted/parted_1.8.8.bb3
2 files changed, 19 insertions, 1 deletions
diff --git a/meta/packages/parted/parted-1.8.8/no_check.patch b/meta/packages/parted/parted-1.8.8/no_check.patch
new file mode 100644
index 0000000000..22d364a0a7
--- /dev/null
+++ b/meta/packages/parted/parted-1.8.8/no_check.patch
@@ -0,0 +1,17 @@
1If check is detected, it makes the builds non-determinstic so just force
2it to be disabled.
3
4RP - 4/11/08
5
6Index: parted-1.8.8/configure.ac
7===================================================================
8--- parted-1.8.8.orig/configure.ac 2008-11-04 15:18:17.000000000 +0000
9+++ parted-1.8.8/configure.ac 2008-11-04 15:18:31.000000000 +0000
10@@ -481,6 +481,6 @@
11 AM_CONDITIONAL([COMPILE_FOR_S390], [test "$compile_for_s390" = "yes"])
12
13 dnl check for "check", unit testing library/header
14-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
15+have_check=no
16 if test "$have_scintilla" != "yes"; then
17 AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])
diff --git a/meta/packages/parted/parted_1.8.8.bb b/meta/packages/parted/parted_1.8.8.bb
index 610dc50476..0e0332b70f 100644
--- a/meta/packages/parted/parted_1.8.8.bb
+++ b/meta/packages/parted/parted_1.8.8.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4SECTION = "console/tools" 4SECTION = "console/tools"
5DEPENDS = "readline e2fsprogs" 5DEPENDS = "readline e2fsprogs"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ 8SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
9 file://no_check.patch;patch=1 \
9 file://syscalls.patch;patch=1 " 10 file://syscalls.patch;patch=1 "
10 11
11EXTRA_OECONF = "--disable-Werror" 12EXTRA_OECONF = "--disable-Werror"