From: Peter Seiderer via buildroot <buildroot@buildroot.org>
To: Peter Seiderer via buildroot <buildroot@buildroot.org>
Cc: buildroot@busybox.net, Bernd Kuhls <bernd@kuhls.net>,
Peter Seiderer <ps.report@gmx.net>
Subject: Re: [Buildroot] [PATCH v1] package/apr: bump version to 1.7.4
Date: Mon, 24 Jun 2024 09:46:12 +0200 [thread overview]
Message-ID: <20240624094612.4ea600ec@gmx.net> (raw)
In-Reply-To: <20240621154422.18332-1-ps.report@gmx.net>
On Fri, 21 Jun 2024 17:44:22 +0200, Peter Seiderer via buildroot <buildroot@buildroot.org> wrote:
> - 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
>
> For details see [2].
>
> [1] https://github.com/apache/apr/commit/130cf8cb3c6fe713095e560ade1df050aa2a6a14
> [2] https://downloads.apache.org/apr/CHANGES-APR-1.7
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> ...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
>
> diff --git a/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch
> deleted file mode 100644
> index f80db1cb6b..0000000000
> --- a/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001
> -From: Graham Leggett <minfrin@apache.org>
> -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 <ps.report@gmx.net>
> ----
> - 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
> -
> diff --git a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch
> deleted file mode 100644
> index ad250d4427..0000000000
> --- a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch
> +++ /dev/null
> @@ -1,112 +0,0 @@
> -From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001
> -From: Graham Leggett <minfrin@apache.org>
> -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 <ps.report@gmx.net>
> ----
> - 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
> -
> diff --git a/package/apr/apr.hash b/package/apr/apr.hash
> index 96f43d3710..66a183c11d 100644
> --- a/package/apr/apr.hash
> +++ b/package/apr/apr.hash
> @@ -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
> diff --git a/package/apr/apr.mk b/package/apr/apr.mk
> index cb8c12dd65..4eb6eb12ad 100644
> --- a/package/apr/apr.mk
> +++ b/package/apr/apr.mk
> @@ -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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2024-06-24 7:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-21 15:44 [Buildroot] [PATCH v1] package/apr: bump version to 1.7.4 Peter Seiderer via buildroot
2024-06-24 7:46 ` Peter Seiderer via buildroot [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240624094612.4ea600ec@gmx.net \
--to=buildroot@buildroot.org \
--cc=bernd@kuhls.net \
--cc=buildroot@busybox.net \
--cc=ps.report@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.