Merge branch 'master' of ssh://git@git.moblin.org/poky

This commit is contained in:
Joshua Lock 2008-11-04 15:38:21 +00:00
commit 74e5d027b9
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,17 @@
If check is detected, it makes the builds non-determinstic so just force
it to be disabled.
RP - 4/11/08
Index: parted-1.8.8/configure.ac
===================================================================
--- parted-1.8.8.orig/configure.ac 2008-11-04 15:18:17.000000000 +0000
+++ parted-1.8.8/configure.ac 2008-11-04 15:18:31.000000000 +0000
@@ -481,6 +481,6 @@
AM_CONDITIONAL([COMPILE_FOR_S390], [test "$compile_for_s390" = "yes"])
dnl check for "check", unit testing library/header
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
+have_check=no
if test "$have_scintilla" != "yes"; then
AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])

View File

@ -3,9 +3,10 @@ HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
LICENSE = "GPLv2"
SECTION = "console/tools"
DEPENDS = "readline e2fsprogs"
PR = "r2"
PR = "r3"
SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
file://no_check.patch;patch=1 \
file://syscalls.patch;patch=1 "
EXTRA_OECONF = "--disable-Werror"