summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorScott Garman <sgarman@zenlinux.com>2012-01-30 18:40:29 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-01 15:15:15 +0000
commit58026ecc28c59793259dd939f90e764ee0d95485 (patch)
treec738f9a294de0008aa41209cffad1ba9f0e3de22 /meta/recipes-devtools
parent76640582e8ba114d4e80a494f6680fd0ce57ca58 (diff)
downloadpoky-58026ecc28c59793259dd939f90e764ee0d95485.tar.gz
e2fsprogs: remove unneeded patch and re-enable PARALLEL_MAKE
Koen Kooi suggested that the quotefix patch was not needed, and the build of the recipe should now be multithread-safe. My testing has confirmed this. (From OE-Core rev: 731700ec390d680ee4d277312755bea0ab4aeeec) Signed-off-by: Scott Garman <sgarman@zenlinux.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch44
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb7
2 files changed, 2 insertions, 49 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch
deleted file mode 100644
index e576f35ccc..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Upstream-Status: Pending
2
3These macros are underquoted and break with recent autoconf+automake
4combinations. - RP 2010-01-02
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7
8diff -urN e2fsprogs-1.42.orig//configure.in e2fsprogs-1.42/configure.in
9--- e2fsprogs-1.42.orig//configure.in 2011-11-28 09:28:22.000000000 -0800
10+++ e2fsprogs-1.42/configure.in 2012-01-12 14:42:54.820531407 -0800
11@@ -439,11 +439,11 @@
12 AC_MSG_ERROR([pkg-config not installed; please install it.])
13 fi
14
15- AC_CHECK_LIB(uuid, uuid_generate,
16+ [AC_CHECK_LIB(uuid, uuid_generate,
17 [LIBUUID=`$PKG_CONFIG --libs uuid`;
18 STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
19 [AC_MSG_ERROR([external uuid library not found])],
20- [$LIBUUID])
21+ [$LIBUUID])]
22 UUID_CMT=#
23 AC_MSG_RESULT([Disabling private uuid library])
24 else
25@@ -939,15 +939,15 @@
26 AH_TEMPLATE([HAVE_SEM_INIT], [Define to 1 if sem_init() exists])
27 SEM_INIT_LIB=''
28 AC_CHECK_FUNC(sem_init, ,
29- AC_CHECK_LIB(pthread, sem_init,
30+ [AC_CHECK_LIB(pthread, sem_init,
31 AC_DEFINE(HAVE_SEM_INIT, 1)
32 SEM_INIT_LIB=-lpthread,
33- AC_CHECK_LIB(rt, sem_init,
34+ [AC_CHECK_LIB(rt, sem_init,
35 AC_DEFINE(HAVE_SEM_INIT, 1)
36 SEM_INIT_LIB=-lrt,
37- AC_CHECK_LIB(posix4, sem_init,
38+ [AC_CHECK_LIB(posix4, sem_init,
39 AC_DEFINE(HAVE_SEM_INIT, 1)
40- SEM_INIT_LIB=-lposix4))))dnl
41+ SEM_INIT_LIB=-lposix4)])])])dnl
42 AC_SUBST(SEM_INIT_LIB)
43 dnl
44 dnl Check for unified diff
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index f6759aa7d4..2289211c80 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,16 +1,13 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://quotefix.patch \ 5SRC_URI += "file://fallocate.patch \
6 file://fallocate.patch \
7 file://acinclude.m4" 6 file://acinclude.m4"
8 7
9SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" 8SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
10SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46" 9SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46"
11 10
12PARALLEL_MAKE = ""
13
14EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" 11EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
15EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 12EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
16EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 13EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"