Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions srcpkgs/apr/patches/fix-musl-32bit-strerror_r-conversion.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
32-bit musl strerror_r returns int instead of char*
diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c
index 60ea2f7bd..e17d01232 100644
--- a/misc/unix/errorcodes.c
+++ b/misc/unix/errorcodes.c
@@ -352,7 +352,7 @@ static char *apr_os_strerror(char* buf, apr_size_t bufsize, int err)
}
#endif

-#if defined(HAVE_STRERROR_R) && defined(STRERROR_R_RC_INT) && !defined(BEOS)
+#if !defined(__GLIBC__) || (defined(HAVE_STRERROR_R) && defined(STRERROR_R_RC_INT) && !defined(BEOS))
/* AIX and Tru64 style */
static char *native_strerror(apr_status_t statcode, char *buf,
apr_size_t bufsize)
4 changes: 2 additions & 2 deletions srcpkgs/apr/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'apr'
pkgname=apr
version=1.7.4
version=1.7.6
revision=1
build_style=gnu-configure
configure_args="--with-installbuilddir=/usr/share/apr-1/build"
Expand All @@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://apr.apache.org/"
distfiles="https://archive.apache.org/dist/apr/apr-${version}.tar.bz2"
checksum=fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577
checksum=49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32

# Can't run test programs when cross compiling
# NOTE always diff between native and cross build!!!
Expand Down