package/apr: bump version to 1.7.4
PATCH 1/1 package/apr: bump version to 1.7.4
- remove 0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch and 0003-Revert-Add-the-ability-to-cross-compile-APR.patch (cross compile hopefully fixes by upstream commit [1])
For details see [2].
[1] https://github.com/apache/apr/commit/130cf8cb3c6fe713095e560ade1df050aa2a6a14
[2] https://downloads.apache.org/apr/CHANGES-APR-1.7
--- ...r1872164.-Fix-the-name-of-libtool-wh.patch | 30 ----- ...Add-the-ability-to-cross-compile-APR.patch | 112 ------------------ package/apr/apr.hash | 4 +- package/apr/apr.mk | 2 +- 4 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch delete mode 100644 package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch
package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001 -From: Graham Leggett <[email protected]> -Date: Wed, 1 Jan 2020 10:43:39 +0000 -Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when - cross compiling. - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68 - -[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1] -Signed-off-by: Peter Seiderer <[email protected]> ---- - apr-config.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apr-config.in b/apr-config.in -index bed47ca..4873fc0 100644 ---- a/apr-config.in -+++ b/apr-config.in -@@ -246,7 +246,7 @@ while test $# -gt 0; do - if test "$location" = "installed"; then - echo "${installbuilddir}/libtool" - elif test "$location" = "crosscompile"; then -- echo "$APR_TARGET_DIR/${installbuilddir}/libtool" -+ echo "$APR_TARGET_DIR/${installbuilddir}/build" - else - echo "$APR_BUILD_DIR/libtool" - fi --- -2.39.2 -
package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch deleted +0 -112
112 lines not on this page · raw message
package/apr/apr.hash +2 -2
@@ -1,4 +1,4 @@ -# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 -sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.4.tar.bz2.sha256 +sha256 fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577 apr-1.7.4.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
package/apr/apr.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.2 +APR_VERSION = 1.7.4 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0
Signature · 6 lines
2.45.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 3 lines · Peter Seiderer via buildroot
- remove 0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch and 0003-Revert-Add-the-ability-to-cross-compile-APR.patch (cross compile hopefully fixes by upstream commit [1])
A clean complete build fails for apr-util with:
Makefile:50: .../build/apr-util-1.6.3/build/rules.mk: No such file or directory make[2]: *** No rule to make target '.../build/apr-util-1.6.3/build/rules.mk'. Stop.
Seems at least 0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch is still needed...
Regards,
Peter
Quoted 186 lines
For details see [2].
[1] https://github.com/apache/apr/commit/130cf8cb3c6fe713095e560ade1df050aa2a6a14
[2] https://downloads.apache.org/apr/CHANGES-APR-1.7Signed-off-by Peter Seiderer <[email protected]>--- ...r1872164.-Fix-the-name-of-libtool-wh.patch | 30 ----- ...Add-the-ability-to-cross-compile-APR.patch | 112 ------------------ package/apr/apr.hash | 4 +- package/apr/apr.mk | 2 +- 4 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch delete mode 100644 package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patchpackage/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch deleted +0
-30@@ -1,30 +0,0 @@ -From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001 -From: Graham Leggett <[email protected]> -Date: Wed, 1 Jan 2020 10:43:39 +0000 -Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when - cross compiling. - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68 - -[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1] -Signed-off-by: Peter Seiderer <[email protected]> ---- - apr-config.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apr-config.in b/apr-config.in -index bed47ca..4873fc0 100644 ---- a/apr-config.in -+++ b/apr-config.in -@@ -246,7 +246,7 @@ while test $# -gt 0; do - if test "$location" = "installed"; then - echo "${installbuilddir}/libtool" - elif test "$location" = "crosscompile"; then -- echo "$APR_TARGET_DIR/${installbuilddir}/libtool" -+ echo "$APR_TARGET_DIR/${installbuilddir}/build" - else - echo "$APR_BUILD_DIR/libtool" - fi --- -2.39.2 -package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch deleted +0
-112@@ -1,112 +0,0 @@ -From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001 -From: Graham Leggett <[email protected]> -Date: Tue, 31 Dec 2019 21:26:02 +0000 -Subject: [PATCH] Revert: Add the ability to cross compile APR. - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68 - -[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] -Signed-off-by: Peter Seiderer <[email protected]> ---- - CHANGES | 2 -- - apr-config.in | 22 ---------------------- - 2 files changed, 24 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 71b2f0e..e751c90 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -56,8 +56,6 @@ Changes for APR 1.7.1 - *) Don't try to use PROC_PTHREAD by default when cross compiling. - [Yann Ylavic] - -- *) Add the ability to cross compile APR. [Graham Leggett] -- - *) While cross-compiling, the tools/gen_test_char could not - be executed at build time, use AX_PROG_CC_FOR_BUILD to - build native tools/gen_test_char -diff --git a/apr-config.in b/apr-config.in -index 4873fc0..84b4073 100644 ---- a/apr-config.in -+++ b/apr-config.in -@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@" - # NOTE: the following line is modified during 'make install': alter with care! - location=@APR_CONFIG_LOCATION@ - --# absolute path, but not installed path - we're cross compiling --case "$0" in -- "${bindir}/"*) ;; -- "/"*) location=crosscompile; -- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;; -- *) ;; --esac -- - show_usage() - { - cat << EOF -@@ -101,8 +93,6 @@ fi - - if test "$location" = "installed"; then - LA_FILE="$libdir/lib${APR_LIBNAME}.la" --elif test "$location" = "crosscompile"; then -- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la" - else - LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" - fi -@@ -132,8 +122,6 @@ while test $# -gt 0; do - --includedir) - if test "$location" = "installed"; then - flags="$includedir" -- elif test "$location" = "crosscompile"; then -- flags="$APR_TARGET_DIR/$includedir" - elif test "$location" = "source"; then - flags="$APR_SOURCE_DIR/include" - else -@@ -166,8 +154,6 @@ while test $# -gt 0; do - --includes) - if test "$location" = "installed"; then - flags="$flags -I$includedir $EXTRA_INCLUDES" -- elif test "$location" = "crosscompile"; then -- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" - else -@@ -182,8 +168,6 @@ while test $# -gt 0; do - --installbuilddir) - if test "$location" = "installed"; then - echo "${installbuilddir}" -- elif test "$location" = "crosscompile"; then -- echo "$APR_TARGET_DIR/${installbuilddir}" - elif test "$location" = "source"; then - echo "$APR_SOURCE_DIR/build" - else -@@ -200,8 +184,6 @@ while test $# -gt 0; do - if test "$location" = "installed"; then - ### avoid using -L if libdir is a "standard" location like /usr/lib - flags="$flags -L$libdir -l${APR_LIBNAME}" -- elif test "$location" = "crosscompile"; then -- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" - else - ### this surely can't work since the library is in .libs? - flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}" -@@ -219,8 +201,6 @@ while test $# -gt 0; do - # Since the user is specifying they are linking with libtool, we - # *know* that -R will be recognized by libtool. - flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" -- elif test "$location" = "crosscompile"; then -- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi -@@ -245,8 +225,6 @@ while test $# -gt 0; do - --apr-libtool) - if test "$location" = "installed"; then - echo "${installbuilddir}/libtool" -- elif test "$location" = "crosscompile"; then -- echo "$APR_TARGET_DIR/${installbuilddir}/build" - else - echo "$APR_BUILD_DIR/libtool" - fi --- -2.39.2 -package/apr/apr.hash +2
-2@@ -1,4 +1,4 @@ -# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 -sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.4.tar.bz2.sha256 +sha256 fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577 apr-1.7.4.tar.bz2 # Locally calculated sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSEpackage/apr/apr.mk +0
-0
package/apr/apr.mk line 10
Quoted 8 lines
package/apr/apr.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -APR_VERSION = 1.7.2 +APR_VERSION = 1.7.4 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot