From: klarasm <klarasm@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] apr-util: update to 1.6.3
Date: Thu, 09 Mar 2023 20:33:04 +0100 [thread overview]
Message-ID: <20230309193304.RfMRnkzbFgC8NAhq3L-5BPE_i96MnW4fNf76bHTUEVQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42636@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 935 bytes --]
There is an updated pull request by klarasm against master on the void-packages repository
https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636
apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948
- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
#### Testing the changes
- I tested the changes in this PR: crossbuilds failing
Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail
A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 4765 bytes --]
From c1fd1fb9957b9fc964471ee3b109353a6048f909 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 1/2] apr-util: update to 1.6.2
failed to download distfiles when revbumping
- update mirror
- remove upstreamed patch
- switch to vsed
---
srcpkgs/apr-util/patches/mysql.patch | 15 --------------
srcpkgs/apr-util/template | 30 +++++++++++++++-------------
2 files changed, 16 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/apr-util/patches/mysql.patch
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
-
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
- my_init();
-+#endif
- mysql_thread_init();
-
- /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..2a5ec59fbf72 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
# Template file for 'apr-util'
pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
build_style=gnu-configure
configure_args="
--with-pgsql --with-ldap
@@ -17,18 +17,19 @@ short_desc="Apache Portable Runtime Utility Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
# fails to build tests
make_check=no
+
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
LDFLAGS="-latomic"
fi
pre_configure() {
- sed -i configure \
+ vsed -i configure \
-e "s;^\( APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
@@ -39,15 +40,16 @@ pre_configure() {
post_configure() {
# Hacks to make cross compiling work
- sed -i build/rules.mk \
- -e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
- -e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
- -e "s;--mode=link;& --tag=CC;g" \
- -e "s;--mode=compile;& --tag=CC;g" \
- -e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
- -e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
- -e '/^LINK /s;$(COMPILE);$(CC);'
-
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i build/rules.mk \
+ -e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+ -e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+ -e "s;--mode=link;& --tag=CC;g" \
+ -e "s;--mode=compile;& --tag=CC;g" \
+ -e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
+ -e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
+ -e '/^LINK /s;$(COMPILE);$(CC);'
+ fi
}
post_install() {
From 5e22e58587c532aa527e2a377c081a2dc123251e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 9 Mar 2023 20:09:19 +0100
Subject: [PATCH 2/2] libtool: allow programs to be overridden again
---
srcpkgs/libtool/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49..1a268a26c2f9 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
# Template file for 'libtool'
pkgname=libtool
version=2.4.7
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="texinfo perl automake help2man xz gnulib tar"
depends="tar sed grep"
@@ -38,8 +38,8 @@ post_install() {
# things that need to go; the target libtool script is meant to be used
# in native environments, not in cross environments, so patch the script
if [ "$CROSS_BUILD" ]; then
- # e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
- vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
+ # e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+ vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
${PKGDESTDIR}/usr/bin/libtool
# clear out any sysroot present
next prev parent reply other threads:[~2023-03-09 19:33 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 22:42 [PR PATCH] " klarasm
2023-03-06 22:44 ` [PR PATCH] [Updated] " klarasm
2023-03-06 22:50 ` klarasm
2023-03-06 22:55 ` klarasm
2023-03-07 0:28 ` klarasm
2023-03-07 1:01 ` [PR PATCH] [Updated] " klarasm
2023-03-07 1:07 ` klarasm
2023-03-09 16:39 ` klarasm
2023-03-09 17:04 ` klarasm
2023-03-09 17:11 ` klarasm
2023-03-09 17:14 ` [PR PATCH] [Updated] " klarasm
2023-03-09 18:28 ` paper42
2023-03-09 19:03 ` klarasm
2023-03-09 19:12 ` [PR PATCH] [Updated] " klarasm
2023-03-09 19:33 ` klarasm [this message]
2023-03-09 19:37 ` klarasm
2023-03-09 21:05 ` oreo639
2023-03-09 21:06 ` oreo639
2023-03-09 21:07 ` oreo639
2023-03-09 21:07 ` oreo639
2023-03-09 21:07 ` oreo639
2023-03-09 21:09 ` oreo639
2023-03-09 21:10 ` oreo639
2023-03-09 21:54 ` [PR PATCH] [Updated] " klarasm
2023-03-09 22:04 ` klarasm
2023-03-09 22:04 ` klarasm
2023-05-15 16:46 ` [PR PATCH] [Updated] " klarasm
2023-05-15 16:46 ` klarasm
2023-05-15 16:53 ` klarasm
2023-08-04 10:00 ` dkwo
2023-08-04 10:42 ` oreo639
2023-08-04 10:42 ` oreo639
2023-08-04 10:43 ` oreo639
2023-08-04 10:44 ` oreo639
2023-08-04 10:44 ` oreo639
2023-08-04 10:47 ` oreo639
2023-08-04 10:47 ` oreo639
2023-08-04 10:49 ` oreo639
2023-08-04 10:50 ` oreo639
2023-08-04 10:51 ` oreo639
2023-08-04 10:57 ` klarasm
2023-08-04 11:18 ` oreo639
2023-08-04 11:18 ` oreo639
2023-08-04 11:20 ` klarasm
2023-08-04 11:21 ` klarasm
2023-08-04 11:22 ` oreo639
2023-08-04 11:22 ` oreo639
2023-08-04 11:23 ` oreo639
2023-08-04 11:24 ` oreo639
2023-08-04 13:07 ` dkwo
2023-08-08 19:57 ` oreo639
2023-08-08 20:02 ` oreo639
2023-08-08 20:03 ` oreo639
2023-08-08 20:10 ` oreo639
2023-08-08 22:26 ` klarasm
2023-08-08 22:28 ` oreo639
2023-08-08 22:29 ` oreo639
2023-08-08 22:30 ` oreo639
2023-08-08 22:30 ` klarasm
2023-08-08 22:31 ` [PR PATCH] [Updated] " klarasm
2023-08-08 22:38 ` klarasm
2023-08-08 22:43 ` oreo639
2023-08-08 22:46 ` oreo639
2023-08-08 22:47 ` oreo639
2023-08-08 22:47 ` oreo639
2023-08-08 22:48 ` oreo639
2023-08-08 22:50 ` [PR PATCH] [Updated] " klarasm
2023-08-08 22:55 ` klarasm
2023-08-17 21:43 ` [PR PATCH] [Updated] " klarasm
2023-08-17 21:50 ` klarasm
2023-08-19 18:27 ` Emru1
2023-08-20 7:04 ` oreo639
2023-08-22 18:20 ` [PR PATCH] [Merged]: " classabbyamp
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=20230309193304.RfMRnkzbFgC8NAhq3L-5BPE_i96MnW4fNf76bHTUEVQ@z \
--to=klarasm@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).