diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-02-02 04:06:11 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 11:06:29 +0000 |
commit | 561d0ce5031429e78220f1d4e206829ad3a6cd1b (patch) | |
tree | 6ec1ddfd739dce56f3cd275b4f285b78061c5e20 /meta/recipes-support/apr/apr/cleanup.patch | |
parent | 659d10a64cab58ffcf24522d17960adc66f7158d (diff) | |
download | poky-561d0ce5031429e78220f1d4e206829ad3a6cd1b.tar.gz |
apr: 1.6.2 -> 1.6.3
1. Improve inappropriate patches:
- Drop inappropriate configure_fixes.patch
Use setting variable ac_cv_file__dev_zero and
ac_cv_sizeof_struct_iovec to replace
- Drop cleanup.patch
Aassign variable libtool at ./buildconf executing and
use 0001-build-buildcheck.sh-improve-libtool-detection.patch
to replace. Submitted it to upstream.
- Rename configfix.patch to
0002-apr-Remove-workdir-path-references-from-installed-ap.patch
Add its original comments and author, explain why it is inappropriate
- Drop upgrade-and-fix-1.5.1.patch
Use 0003-Makefile.in-configure.in-support-cross-compiling.patch
to replace. And submitted it to upstream.
2. Fix build path issue to improve reproducibility
(From OE-Core rev: 29c4b19e640b544c9c351aec4292a3f65b619998)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr/apr/cleanup.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/cleanup.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch deleted file mode 100644 index b6784e015d..0000000000 --- a/meta/recipes-support/apr/apr/cleanup.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: apr-1.4.2/build/buildcheck.sh | ||
4 | =================================================================== | ||
5 | --- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800 | ||
6 | +++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800 | ||
7 | @@ -32,35 +32,4 @@ | ||
8 | echo "buildconf: autoconf version $ac_version (ok)" | ||
9 | fi | ||
10 | |||
11 | -# Sample libtool --version outputs: | ||
12 | -# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) | ||
13 | -# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a | ||
14 | -# output is multiline from 1.5 onwards | ||
15 | - | ||
16 | -# Require libtool 1.4 or newer | ||
17 | -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | ||
18 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | ||
19 | -if test -z "$lt_pversion"; then | ||
20 | -echo "buildconf: libtool not found." | ||
21 | -echo " You need libtool version 1.4 or newer installed" | ||
22 | -echo " to build APR from SVN." | ||
23 | -exit 1 | ||
24 | -fi | ||
25 | -lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` | ||
26 | -IFS=.; set $lt_version; IFS=' ' | ||
27 | -lt_status="good" | ||
28 | -if test "$1" = "1"; then | ||
29 | - if test "$2" -lt "4"; then | ||
30 | - lt_status="bad" | ||
31 | - fi | ||
32 | -fi | ||
33 | -if test $lt_status = "good"; then | ||
34 | - echo "buildconf: libtool version $lt_pversion (ok)" | ||
35 | - exit 0 | ||
36 | -fi | ||
37 | - | ||
38 | -echo "buildconf: libtool version $lt_pversion found." | ||
39 | -echo " You need libtool version 1.4 or newer installed" | ||
40 | -echo " to build APR from SVN." | ||
41 | - | ||
42 | -exit 1 | ||
43 | +exit 0 | ||