upgrade: apr to 1.5.1 and apr-utils to 1.5.3

PATCH In review Hongxu Jia 2 participants 8 messages Jun 4, 2014

Share & tools

Hongxu Jia

author

2014-06-04 03:27 UTC #0 lore raw

v3 cover upgrade: apr to 1.5.1 and apr-utils to 1.5.3

Change in apr V3:
- To help future bisecting this should be merged with the upgrade patch into a single upgrade-and-fix patch.
- Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time.

Change in apr V2:
- In the target build, use $BUILD_CC to compile tools/gen_test_char rather than to invoke the native one.

//Hongxu

The following changes since commit 894df445fa71a170397c6e0b4960a89ef20a4230:

guile: Update to 2.0.11 version (2014-05-21 19:50:21 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/upgrade-apr
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr

Hongxu Jia (3):
apr-util: upgrade to 1.5.3
apr: upgrade to 1.5.1
apr: fix cross compiling failed

 .../apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb}   |  4 +-
 meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48 ++++++++++++++++++++++
 .../apr/{apr_1.4.8.bb => apr_1.5.1.bb}             |  7 ++--
 3 files changed, 54 insertions(+), 5 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} (93%)
 create mode 100644 meta/recipes-support/apr/apr/upgrade-and-fix.patch
 rename meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} (90%)

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-06-04 03:27 UTC #1 lore raw

PATCH v3 1/3 apr-util: upgrade to 1.5.3

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/apr/{apr-util_1.5.2.bb => apr-util_1.5.3.bb} (93%)

meta/recipes-support/apr/apr-util_1.5.3.bb renamed from meta/recipes-support/apr/apr-util_1.5.2.bb +2 -2

similarity index 93%
rename from meta/recipes-support/apr/apr-util_1.5.2.bb
rename to meta/recipes-support/apr/apr-util_1.5.3.bb
index 4546b97..063a787 100644
@@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "eb682cfb8642babba427a4fb391b15e8"
-SRC_URI[sha256sum] = "a1ec5025373815795d2fa5bfac40c0984675feffc88e049be9a162c408c2f613"
+SRC_URI[md5sum] = "71a11d037240b292f824ba1eb537b4e3"
+SRC_URI[sha256sum] = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 
 		--without-odbc \

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-06-04 03:27 UTC #2 lore raw

PATCH v3 2/3 apr: upgrade to 1.5.1

In reply to Hongxu Jia

The LICENSE has no change, except a newline added.

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/apr/{apr_1.4.8.bb => apr_1.5.1.bb} (91%)

meta/recipes-support/apr/apr_1.5.1.bb renamed from meta/recipes-support/apr/apr_1.4.8.bb +3 -3

similarity index 91%
rename from meta/recipes-support/apr/apr_1.4.8.bb
rename to meta/recipes-support/apr/apr_1.5.1.bb
index 0a77ad7..7f2d2ca 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 DEPENDS = "util-linux"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \
                     file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
 
 BBCLASSEXTEND = "native"

@@ -16,8 +16,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://run-ptest \
 "
 
-SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41"
-SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421"
+SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"
+SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac"
 
 inherit autotools-brokensep lib_package binconfig multilib_header ptest

Signature · 1 line

1.8.1.2

Hongxu Jia

author

2014-06-04 03:27 UTC #3 lore raw

PATCH v3 3/3 apr: fix cross compiling failed

In reply to Hongxu Jia

The do_compile failed:

| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127

The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we built it with $BUILD_CC.

To make sure there was no side effect on the change, not adding this patch, I did the test:

1. Built the native tools/gen_test_char on x86-64 host, and invoke it on that host;

2. Built the target tools/gen_test_char which arch was arm, and invoke it on the qemuarm;

3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */

static const unsigned char test_char_table[256] = {
    32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
    17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
    55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
    0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
    30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};

...

The do_install failed:
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image
install
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/ apr-1.5.1'
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh include/private
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: Permission denied

Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time.

Signed-off-by Hongxu Jia <[email protected]>

---
 meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48 ++++++++++++++++++++++
 meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 meta/recipes-support/apr/apr/upgrade-and-fix.patch

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +48 -0

new file mode 100644
index 0000000..4bca384
@@ -0,0 +1,48 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+compile it with $BUILD_CC.
+
+Remove the 'tools' dir creation, it always existed.
+And it caused gen_test_char unexpected rebuilt at
+do_install time.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.in | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6f99733..5fe028f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+ 
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
+ 	include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+ 	etags `find . -name '*.[ch]'`
+ 
+-make_tools_dir:
+-	$(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++	$(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
+ 
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+ 	$(APR_MKDIR) include/private
+-- 
+1.8.1.2
+

meta/recipes-support/apr/apr_1.5.1.bb +1 -0

index 7f2d2ca..8c77af2 100644
@@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://cleanup.patch \
            file://configfix.patch \
            file://run-ptest \
+           file://upgrade-and-fix.patch \
 "
 
 SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"

Signature · 1 line

1.8.1.2

Saul Wold

2014-06-04 05:49 UTC #4 lore raw

Re: [PATCH 3/3] apr: fix cross compiling failed

Quoted 60 lines · Hongxu Jia

The do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127
The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we built it with $BUILD_CC.
To make sure there was no side effect on the change, not adding this patch, I did the test:
1. Built the native tools/gen_test_char on x86-64 host, and invoke
    it on that host;
2. Built the target tools/gen_test_char which arch was arm, and invoke
    it on the qemuarm;
3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
static const unsigned char test_char_table[256] = {
     32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
     17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
     55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};
...
The do_install failed:
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image
install
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/ apr-1.5.1'
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh include/private
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: Permission denied
Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time.

Quoted 7 lines

Signed-off-by Hongxu Jia <[email protected]>
---
  meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48 ++++++++++++++++++++++
  meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
  2 files changed, 49 insertions(+)
create mode 100644 meta/recipes-support/apr/apr/upgrade-and-fix.patch

Why not combine this with the 1.5.1 update so they are together?

Sau!

Quoted 67 lines

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +48 -0

new file mode 100644
index 0000000..4bca384
@@ -0,0 +1,48 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+compile it with $BUILD_CC.
+
+Remove the 'tools' dir creation, it always existed.
+And it caused gen_test_char unexpected rebuilt at
+do_install time.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.in | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6f99733..5fe028f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
+ 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-	tools/gen_test_char.o tools/gen_test_char.lo \
+ 	include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+ 	include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+ 	etags `find . -name '*.[ch]'`
+
+-make_tools_dir:
+-	$(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++	$(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
+
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+ 	$(APR_MKDIR) include/private
+--
+1.8.1.2
+

meta/recipes-support/apr/apr_1.5.1.bb +1 -0

index 7f2d2ca..8c77af2 100644
@@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
             file://cleanup.patch \
             file://configfix.patch \
             file://run-ptest \
+           file://upgrade-and-fix.patch \
  "
 
  SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"

Hongxu Jia

author

2014-06-04 05:52 UTC #5 lore raw

Re: [PATCH 3/3] apr: fix cross compiling failed

Quoted 63 lines · Saul Wold

Quoted 62 lines · Hongxu Jia
The do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127
The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we built it with $BUILD_CC.
To make sure there was no side effect on the change, not adding this patch, I did the test:
1. Built the native tools/gen_test_char on x86-64 host, and invoke
    it on that host;
2. Built the target tools/gen_test_char which arch was arm, and invoke
    it on the qemuarm;
3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
static const unsigned char test_char_table[256] = { 32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
     17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
     55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};
...
The do_install failed:
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image
install
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/ apr-1.5.1'
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh include/private
| tools/gen_test_char > include/private/apr_escape_test_char.h | /bin/sh: tools/gen_test_char: Permission denied
Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time.

Quoted 11 lines

Quoted 8 lines
Signed-off-by Hongxu Jia <[email protected]>
---
  meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48 
++++++++++++++++++++++
  meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
  2 files changed, 49 insertions(+)
create mode 100644 meta/recipes-support/apr/apr/upgrade-and-fix.patch
Why not combine this with the 1.5.1 update so they are together?

Got it, I will rename it.

//Hongxu

Quoted 71 lines

Sau!

Quoted 68 lines

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +24 -0

new file mode 100644
index 0000000..4bca384
@@ -0,0 +1,48 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+compile it with $BUILD_CC.
+
+Remove the 'tools' dir creation, it always existed.
+And it caused gen_test_char unexpected rebuilt at
+do_install time.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.in | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6f99733..5fe028f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c

.make.dirs \

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +24 -0

+     build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-    tools/gen_test_char.o tools/gen_test_char.lo \
+     include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+     include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+     etags `find . -name '*.[ch]'`
+
+-make_tools_dir:
+-    $(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-    $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++    $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
+
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+     $(APR_MKDIR) include/private
+--
+1.8.1.2
+

meta/recipes-support/apr/apr_1.5.1.bb +1 -0

index 7f2d2ca..8c77af2 100644
@@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
             file://cleanup.patch \
             file://configfix.patch \
             file://run-ptest \
+           file://upgrade-and-fix.patch \
  "
 
  SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"

Hongxu Jia

author

2014-06-04 06:00 UTC #6 lore raw

Re: [PATCH 3/3] apr: fix cross compiling failed

In reply to Saul Wold

Quoted 74 lines · Saul Wold

Quoted 62 lines · Hongxu Jia
The do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127
The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we built it with $BUILD_CC.
To make sure there was no side effect on the change, not adding this patch, I did the test:
1. Built the native tools/gen_test_char on x86-64 host, and invoke
    it on that host;
2. Built the target tools/gen_test_char which arch was arm, and invoke
    it on the qemuarm;
3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
static const unsigned char test_char_table[256] = { 32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
     17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
     55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};
...
The do_install failed:
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image
install
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/ apr-1.5.1'
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh include/private
| tools/gen_test_char > include/private/apr_escape_test_char.h | /bin/sh: tools/gen_test_char: Permission denied
Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time.
Quoted 8 lines
Signed-off-by Hongxu Jia <[email protected]>
---
  meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48 
++++++++++++++++++++++
  meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
  2 files changed, 49 insertions(+)
create mode 100644 meta/recipes-support/apr/apr/upgrade-and-fix.patch
Why not combine this with the 1.5.1 update so they are together?

Quoted 2 lines

Sau!

Update:

git://git.pokylinux.org/poky-contrib hongxu/upgrade-apr
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr

-rw-r--r-- meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch 48
-rw-r--r-- meta/recipes-support/apr/apr_1.5.1.bb 1

//Hongxu

Quoted 69 lines

Quoted 68 lines

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +24 -0

new file mode 100644
index 0000000..4bca384
@@ -0,0 +1,48 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+compile it with $BUILD_CC.
+
+Remove the 'tools' dir creation, it always existed.
+And it caused gen_test_char unexpected rebuilt at
+do_install time.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.in | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6f99733..5fe028f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c

.make.dirs \

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +24 -0

+     build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-    tools/gen_test_char.o tools/gen_test_char.lo \
+     include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+     include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+     etags `find . -name '*.[ch]'`
+
+-make_tools_dir:
+-    $(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-    $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++    $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
+
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+     $(APR_MKDIR) include/private
+--
+1.8.1.2
+

meta/recipes-support/apr/apr_1.5.1.bb +1 -0

index 7f2d2ca..8c77af2 100644
@@ -14,6 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
             file://cleanup.patch \
             file://configfix.patch \
             file://run-ptest \
+           file://upgrade-and-fix.patch \
  "
 
  SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"

Hongxu Jia

author

2014-06-04 08:13 UTC #7 lore raw

Re: [PATCH 3/3] apr: fix cross compiling failed

Quoted 75 lines · Hongxu Jia

Quoted 74 lines · Saul Wold
Quoted 62 lines · Hongxu Jia
The do_compile failed:
| tools/gen_test_char > include/private/apr_escape_test_char.h
| /bin/sh: tools/gen_test_char: No such file or directory
| make[1]: *** [include/private/apr_escape_test_char.h] Error 127
The tools/gen_test_char was invoked at build time, and it didn't work for the cross compiling, so we built it with $BUILD_CC.
To make sure there was no side effect on the change, not adding this patch, I did the test:
1. Built the native tools/gen_test_char on x86-64 host, and invoke
    it on that host;
2. Built the target tools/gen_test_char which arch was arm, and invoke
    it on the qemuarm;
3. Comparing the results, they were total the same;
...
/* this file is automatically generated by gen_test_char, do not edit. "make include/private/apr_escape_test_char.h" to regenerate. */
static const unsigned char test_char_table[256] = { 32,30,30,30,30,30,30,30,30,30,31,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,6,16,63,22,17,22,49,17,
     17,17,1,16,16,0,0,18,0,0,0,0,0,0,0,0,0,0,16,23,
     55,16,55,23,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,23,31,23,23,0,23,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,23,23,23,17,30,30,30,30,30,30,30,30,30,30,30,30,30,
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30, 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,
     30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30
};
...
The do_install failed:
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 DESTDIR=tmp/work/x86_64-linux/apr-native/1.5.1-r0/image
install
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| make[1]: Entering directory `tmp/work/x86_64-linux/apr-native/1.5.1-r0/ apr-1.5.1'
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh tools | gcc -isystem/home/pokybuild/yocto-autobuilder/yocto-slave/build-appliance/ build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe tools/gen_test_char.c -o tools/gen_test_char
| tmp/work/x86_64-linux/apr-native/1.5.1-r0/apr-1.5.1/build/mkdir.sh include/private
| tools/gen_test_char > include/private/apr_escape_test_char.h | /bin/sh: tools/gen_test_char: Permission denied
Remove the 'tools' dir creation, it always existed. And it caused gen_test_char unexpected rebuilt at do_install time.
Quoted 8 lines
Signed-off-by Hongxu Jia <[email protected]>
---
  meta/recipes-support/apr/apr/upgrade-and-fix.patch | 48 
++++++++++++++++++++++
  meta/recipes-support/apr/apr_1.5.1.bb              |  1 +
  2 files changed, 49 insertions(+)
create mode 100644 meta/recipes-support/apr/apr/upgrade-and-fix.patch
Why not combine this with the 1.5.1 update so they are together?

Quoted 6 lines

Quoted 2 lines
Sau!
Update:
git://git.pokylinux.org/poky-contrib hongxu/upgrade-apr
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-apr

Combine with the 1.5.1 update

http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=hongxu/upgrade-apr&id=4e2741183ccf72be080ab009a3488f08561a77e2

//Hongxu

Quoted 79 lines

(quoted diff) +0 -2

-rw-r--r-- meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch    48
-rw-r--r--    meta/recipes-support/apr/apr_1.5.1.bb    1

//Hongxu

Quoted 70 lines

Quoted 69 lines

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +24 -0

new file mode 100644
index 0000000..4bca384
@@ -0,0 +1,48 @@
+Makefile.in: fix cross compiling failed
+
+The tools/gen_test_char was invoked at build time,
+and it didn't work for the cross compiling, so we
+compile it with $BUILD_CC.
+
+Remove the 'tools' dir creation, it always existed.
+And it caused gen_test_char unexpected rebuilt at
+do_install time.
+
+Upstream-Status: inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <[email protected]>
+---
+ Makefile.in | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6f99733..5fe028f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
+
+ CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c

.make.dirs \

meta/recipes-support/apr/apr/upgrade-and-fix.patch new file +24 -0

+     build/apr_rules.out tools/gen_test_char@EXEEXT@ \
+-    tools/gen_test_char.o tools/gen_test_char.lo \
+     include/private/apr_escape_test_char.h
+ DISTCLEAN_TARGETS = config.cache config.log config.status \
+     include/apr.h include/arch/unix/apr_private.h \
+@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
+ etags:
+     etags `find . -name '*.[ch]'`
+
+-make_tools_dir:
+-    $(APR_MKDIR) tools
+-
+-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+-tools/gen_test_char.lo: make_tools_dir
+-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
+-    $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
++    $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
+
+ include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
+     $(APR_MKDIR) include/private
+--
+1.8.1.2
+

meta/recipes-support/apr/apr_1.5.1.bb +1 -0

index 7f2d2ca..8c77af2 100644
@@ -14,6 +14,7 @@ SRC_URI = 
 "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
 file://cleanup.patch \
 file://configfix.patch \
 file://run-ptest \
+ file://upgrade-and-fix.patch \
  "

SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab"