summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch32
-rw-r--r--meta/recipes-support/apr/apr/libtoolize_check.patch28
-rw-r--r--meta/recipes-support/apr/apr_1.7.0.bb5
3 files changed, 31 insertions, 34 deletions
diff --git a/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
deleted file mode 100644
index 097c195a19..0000000000
--- a/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 4efdc06fb17b8a00a9eca923caa176be741d1e04 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 1 Feb 2018 14:56:13 +0800
4Subject: [PATCH 1/7] build/buildcheck.sh: improve libtool detection
5
6Support customize libtool by variable assigning, it is helpful
7for cross compileing (such as libtool=aarch64-linux-libtool)
8
9Upstream-Status: Submitted [https://github.com/apache/apr/pull/8]
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11---
12 build/buildcheck.sh | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15diff --git a/build/buildcheck.sh b/build/buildcheck.sh
16index ab5df44..f191a41 100755
17--- a/build/buildcheck.sh
18+++ b/build/buildcheck.sh
19@@ -40,7 +40,9 @@ fi
20 # output is multiline from 1.5 onwards
21
22 # Require libtool 1.4 or newer
23-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
24+if test -z "$libtool"; then
25+ libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
26+fi
27 lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
28 if test -z "$lt_pversion"; then
29 echo "buildconf: libtool not found."
30--
311.8.3.1
32
diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch
new file mode 100644
index 0000000000..740792e6b0
--- /dev/null
+++ b/meta/recipes-support/apr/apr/libtoolize_check.patch
@@ -0,0 +1,28 @@
1From: Helmut Grohne <helmut@subdivi.de>
2Subject: check for libtoolize rather than libtool
3Last-Update: 2014-09-19
4
5libtool is now in package libtool-bin, but apr only needs libtoolize.
6
7Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ]
8
9Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
10
11--- apr.orig/build/buildcheck.sh
12+++ apr/build/buildcheck.sh
13@@ -39,11 +39,11 @@ fi
14 # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
15 # output is multiline from 1.5 onwards
16
17-# Require libtool 1.4 or newer
18-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
19-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
20+# Require libtoolize 1.4 or newer
21+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
22+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
23 if test -z "$lt_pversion"; then
24- echo "buildconf: libtool not found."
25+ echo "buildconf: libtoolize not found."
26 echo " You need libtool version 1.4 or newer installed"
27 echo " to build APR from SVN."
28 res=1
diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb
index 09a65bfdd6..eca9cdea48 100644
--- a/meta/recipes-support/apr/apr_1.7.0.bb
+++ b/meta/recipes-support/apr/apr_1.7.0.bb
@@ -11,13 +11,13 @@ BBCLASSEXTEND = "native nativesdk"
11 11
12SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
13 file://run-ptest \ 13 file://run-ptest \
14 file://0001-build-buildcheck.sh-improve-libtool-detection.patch \
15 file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ 14 file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \
16 file://0003-Makefile.in-configure.in-support-cross-compiling.patch \ 15 file://0003-Makefile.in-configure.in-support-cross-compiling.patch \
17 file://0004-Fix-packet-discards-HTTP-redirect.patch \ 16 file://0004-Fix-packet-discards-HTTP-redirect.patch \
18 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ 17 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
19 file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \ 18 file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
20 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ 19 file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
20 file://libtoolize_check.patch \
21 " 21 "
22 22
23SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7" 23SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7"
@@ -47,7 +47,8 @@ do_configure_prepend() {
47 export GREP="grep" 47 export GREP="grep"
48 48
49 cd ${S} 49 cd ${S}
50 libtool='${HOST_SYS}-libtool' ./buildconf 50 # The "2" means libtool version 2.
51 ./buildconf 2
51} 52}
52 53
53FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" 54FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*"