diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-04-17 00:01:44 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-16 23:05:53 +0100 |
commit | c237e5464a99b55f9a0c9cdcf8deeb4cc377ed3f (patch) | |
tree | 2b76f7a552f6a4ca3a4548028d8a8d3267ad2862 /meta | |
parent | 4b992175bfe1822839c2e6762162bf36fe4037ab (diff) | |
download | poky-c237e5464a99b55f9a0c9cdcf8deeb4cc377ed3f.tar.gz |
systemd: use AC_CHECK_TOOL instead of AC_PATH_TOOL when checking objcopy, strings, gperf
* with external toolchain I have different HOST_PREFIX and HOST_SYS
AC_PATH_TOOL is using HOST_SYS as prefix and fails to find objcopy
then it tries objcopy without prefix which is found on host, but
that objcopy does not work for arm libs
* with internal toolchain gperf is not prefixed with HOST_PREFIX, but
fallback to "gperf" only finds the one in native sysroot first
* based on http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037985.html
(From OE-Core rev: 6ae99136f1c1c59f4e55331c43cf0c0bac5abcdd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch | 41 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_199.bb | 6 |
2 files changed, 46 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch b/meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch new file mode 100644 index 0000000000..d847bbc202 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From d6f92bcbbae9a577adb9588c7b2783a5d0bf343d Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 16 Apr 2013 14:20:41 +0200 | ||
4 | Subject: [PATCH] configure: use AC_CHECK_TOOL for objcopy, strings and gperf | ||
5 | |||
6 | * using AC_PATH_TOOL does not allow to override it from shell environment | ||
7 | which is useful when cross-compiling | ||
8 | * with external toolchain I have different HOST_PREFIX and HOST_SYS | ||
9 | AC_PATH_TOOL is using HOST_SYS as prefix and fails to find objcopy | ||
10 | which is available only as ${TARGET_PREFIX}objcopy then it tries | ||
11 | objcopy without prefix which is found on host, but that objcopy | ||
12 | does not work for !host (e.g. arm when building on x86) libs | ||
13 | |||
14 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
15 | Upstream-Status: Submitted | ||
16 | http://lists.freedesktop.org/archives/systemd-devel/2013-April/010468.html | ||
17 | |||
18 | --- | ||
19 | configure.ac | 6 +++--- | ||
20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 33b0ca9..519f1a9 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -86,9 +86,9 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1]) | ||
27 | AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) | ||
28 | enable_introspection=no]) | ||
29 | |||
30 | -AC_PATH_TOOL(OBJCOPY, objcopy) | ||
31 | -AC_PATH_TOOL(STRINGS, strings) | ||
32 | -AC_PATH_TOOL(GPERF, gperf) | ||
33 | +AC_CHECK_TOOL(OBJCOPY, objcopy) | ||
34 | +AC_CHECK_TOOL(STRINGS, strings) | ||
35 | +AC_CHECK_TOOL(GPERF, gperf) | ||
36 | if test -z "$GPERF" ; then | ||
37 | AC_MSG_ERROR([*** gperf not found]) | ||
38 | fi | ||
39 | -- | ||
40 | 1.8.1.5 | ||
41 | |||
diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb index d22df12c6d..bbe19eae10 100644 --- a/meta/recipes-core/systemd/systemd_199.bb +++ b/meta/recipes-core/systemd/systemd_199.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ | |||
9 | PROVIDES = "udev" | 9 | PROVIDES = "udev" |
10 | 10 | ||
11 | PE = "1" | 11 | PE = "1" |
12 | PR = "r2" | 12 | PR = "r3" |
13 | 13 | ||
14 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0" | 14 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0" |
15 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 15 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
@@ -27,6 +27,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | |||
27 | file://0002-readahead-chunk-on-spinning-media.patch \ | 27 | file://0002-readahead-chunk-on-spinning-media.patch \ |
28 | file://0003-readahead-cleanups.patch \ | 28 | file://0003-readahead-cleanups.patch \ |
29 | file://0013-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch \ | 29 | file://0013-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch \ |
30 | file://0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch \ | ||
30 | file://199-firmware.patch \ | 31 | file://199-firmware.patch \ |
31 | file://init \ | 32 | file://init \ |
32 | " | 33 | " |
@@ -77,6 +78,9 @@ EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " | |||
77 | do_configure_prepend() { | 78 | do_configure_prepend() { |
78 | export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" | 79 | export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" |
79 | 80 | ||
81 | export STRINGS = "${HOST_PREFIX}strings" | ||
82 | export GPERF = "${HOST_PREFIX}gperf" | ||
83 | |||
80 | sed -i -e 's:=/root:=${ROOT_HOME}:g' units/*.service* | 84 | sed -i -e 's:=/root:=${ROOT_HOME}:g' units/*.service* |
81 | } | 85 | } |
82 | 86 | ||