diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 15:25:27 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-11-04 15:25:27 +0000 |
commit | 8dd388cac42ef4dc7305d5d5a5b83f955d4c1f7e (patch) | |
tree | 4bee6181fa6783fde30f6e5ed53cf73e4a78b074 | |
parent | 777f2692594e59ee4968ace23af134ea7c481cab (diff) | |
download | poky-8dd388cac42ef4dc7305d5d5a5b83f955d4c1f7e.tar.gz |
parted: Disable use of check, even its its detected since its not in DEPENDS (and isn't needed)
-rw-r--r-- | meta/packages/parted/parted-1.8.8/no_check.patch | 17 | ||||
-rw-r--r-- | meta/packages/parted/parted_1.8.8.bb | 3 |
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 @@ | |||
1 | If check is detected, it makes the builds non-determinstic so just force | ||
2 | it to be disabled. | ||
3 | |||
4 | RP - 4/11/08 | ||
5 | |||
6 | Index: 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" | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | SECTION = "console/tools" | 4 | SECTION = "console/tools" |
5 | DEPENDS = "readline e2fsprogs" | 5 | DEPENDS = "readline e2fsprogs" |
6 | PR = "r2" | 6 | PR = "r3" |
7 | 7 | ||
8 | SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ | 8 | SRC_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 | ||
11 | EXTRA_OECONF = "--disable-Werror" | 12 | EXTRA_OECONF = "--disable-Werror" |