diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-11-19 19:18:19 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:09 +0000 |
commit | dedabc1f36bfa96889d5b6746e7e1bf42f613101 (patch) | |
tree | b06cbbeb1630972f1e6dd1eb42e039f8729bb348 | |
parent | 9470956e686bfdaf41bf6488a9c3598436693d66 (diff) | |
download | poky-dedabc1f36bfa96889d5b6746e7e1bf42f613101.tar.gz |
apr: fix LTFLAGS to make it work with ccache
When ccache is enabled, libtool requires --tag=CC when use ccache,
otherwise when building apr-util with ccache enabled:
| libtool: compile: unable to infer tagged configuration
| libtool: error: specify a tag with '--tag'
| libtool: compile: unable to infer tagged configuration
| make[1]: *** [buckets/apr_buckets.lo] Error 1
(From OE-Core rev: 52c314963e0ab90e6c1ced7bf66b06d4c304358a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch | 36 | ||||
-rw-r--r-- | meta/recipes-support/apr/apr_1.5.2.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch new file mode 100644 index 0000000000..7521eeb469 --- /dev/null +++ b/meta/recipes-support/apr/apr/configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From d439093aa07a486f559206ac9e5808a6a18218cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 19 Nov 2015 18:25:38 -0800 | ||
4 | Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache | ||
5 | |||
6 | When ccache is enabled, libtool requires --tag=CC when use ccache, | ||
7 | otherwise when building apr-util with ccache enabled: | ||
8 | |||
9 | | libtool: compile: unable to infer tagged configuration | ||
10 | | libtool: error: specify a tag with '--tag' | ||
11 | | libtool: compile: unable to infer tagged configuration | ||
12 | | make[1]: *** [buckets/apr_buckets.lo] Error 1 | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
17 | --- | ||
18 | configure.in | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/configure.in b/configure.in | ||
22 | index 5a4a988..9d57ae6 100644 | ||
23 | --- a/configure.in | ||
24 | +++ b/configure.in | ||
25 | @@ -246,7 +246,7 @@ case $host in | ||
26 | ;; | ||
27 | *) | ||
28 | if test "x$LTFLAGS" = "x"; then | ||
29 | - LTFLAGS='--silent' | ||
30 | + LTFLAGS='--silent --tag=CC' | ||
31 | fi | ||
32 | if test "$experimental_libtool" = "yes"; then | ||
33 | # Use a custom-made libtool replacement | ||
34 | -- | ||
35 | 1.7.9.5 | ||
36 | |||
diff --git a/meta/recipes-support/apr/apr_1.5.2.bb b/meta/recipes-support/apr/apr_1.5.2.bb index 1c61e84e53..db1530530a 100644 --- a/meta/recipes-support/apr/apr_1.5.2.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
16 | file://run-ptest \ | 16 | file://run-ptest \ |
17 | file://upgrade-and-fix-1.5.1.patch \ | 17 | file://upgrade-and-fix-1.5.1.patch \ |
18 | file://Fix-packet-discards-HTTP-redirect.patch \ | 18 | file://Fix-packet-discards-HTTP-redirect.patch \ |
19 | file://configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" | 22 | SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" |