From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] [No Merge] autogen: update to 5.18.16
Date: Fri, 08 Nov 2019 06:08:06 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16219@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages autogen
https://github.com/void-linux/void-packages/pull/16219
[No Merge] autogen: update to 5.18.16
Need people to test on their local machines. Travis fails on armv6l-musl and aarch64-musl ; though these build fine locally on my machine
A patch file from https://github.com/void-linux/void-packages/pull/16219.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-autogen-16219.patch --]
[-- Type: text/x-diff, Size: 7336 bytes --]
From edf1ca495be5bb5cdc825340283e91c7ff356f07 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Thu, 7 Nov 2019 22:12:13 -0600
Subject: [PATCH] autogen: update to 5.18.16
---
.../patches/ag_macros.m4_syntax_error.patch | 22 ++++++++++
...llow_overriding_AGexe_for_crossbuild.patch | 43 +++++++++++++++++++
.../autogen/patches/cross-compile-fix.patch | 13 ++++++
srcpkgs/autogen/patches/no-error.patch | 17 ++++++++
srcpkgs/autogen/template | 30 ++++++++-----
5 files changed, 114 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/autogen/patches/ag_macros.m4_syntax_error.patch
create mode 100644 srcpkgs/autogen/patches/allow_overriding_AGexe_for_crossbuild.patch
create mode 100644 srcpkgs/autogen/patches/cross-compile-fix.patch
create mode 100644 srcpkgs/autogen/patches/no-error.patch
diff --git a/srcpkgs/autogen/patches/ag_macros.m4_syntax_error.patch b/srcpkgs/autogen/patches/ag_macros.m4_syntax_error.patch
new file mode 100644
index 00000000000..fc9b1d35c45
--- /dev/null
+++ b/srcpkgs/autogen/patches/ag_macros.m4_syntax_error.patch
@@ -0,0 +1,22 @@
+Description: Fix syntax error (missing comma) in AC_RUN_IFELSE.
+ This bug causes arguments to be shifted. With the bug,
+ presence of strcspn is misdetected everywhere and for cross
+ compilation, the build simply fails.
+Author: Helmut Grohne <helmut@subdivi.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/941025
+Forwarded: no
+Reviewed-By: Andreas Metzler <ametzler@debian.org>
+Last-Update: 2019-10-05
+
+--- config/ag_macros.m4
++++ config/ag_macros.m4
+@@ -428,7 +428,7 @@ int main (int argc, char ** argv) {
+ char zRej@<:@@:>@ = reject;
+ char zAcc@<:@@:>@ = "a-ok-eject";
+ return strcspn( zAcc, zRej ) - 5;
+-}] )]
++}] )],
+ [ag_cv_run_strcspn=yes],[ag_cv_run_strcspn=no],[ag_cv_run_strcspn=no]
+ ) # end of RUN_IFELSE
+ ]) # end of AC_CACHE_VAL for ag_cv_run_strcspn
diff --git a/srcpkgs/autogen/patches/allow_overriding_AGexe_for_crossbuild.patch b/srcpkgs/autogen/patches/allow_overriding_AGexe_for_crossbuild.patch
new file mode 100644
index 00000000000..9ff6def8ebe
--- /dev/null
+++ b/srcpkgs/autogen/patches/allow_overriding_AGexe_for_crossbuild.patch
@@ -0,0 +1,43 @@
+Description: Allow overriding of AGexe (for cross build)
+ build-aux/run-ag.sh hard codes some path for AGexe, which makes the
+ cross build unable to find a working autogen.
+ The relevant callers of run-ag.sh fail to pass the correct AGexe.
+Author: Helmut Grohne <helmut@subdivi.de>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/941025
+Forwarded: no
+Reviewed-By: Andreas Metzler <ametzler@debian.org>
+Last-Update: 2019-10-05
+
+--- build-aux/run-ag.sh
++++ build-aux/run-ag.sh
+@@ -25,7 +25,6 @@
+ # any containing directory must be created. The target is created with a
+ # very old time stamp.
+ #
+-AGexe=/u/bkorb/tools/ag/autogen-bld/agen5/.libs/autogen
+ find_exe() {
+ eval local exe=\${$1}
+ test -x "$exe" && return 0
+--- getdefs/Makefile.am
++++ getdefs/Makefile.am
+@@ -32,7 +32,7 @@ nodist_getdefs_SOURCES = $(BUILT_SOURCES
+ SUBDIRS = test
+ EXTRA_DIST = opts.def $(gdsrcs)
+ AG_ENV = top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" \
+- VERBOSE="$(V)"
++ VERBOSE="$(V)" AGexe="$(AGexe)"
+ RUN_AG = $(AG_ENV) $(SHELL) "${top_srcdir}/build-aux/run-ag.sh"
+
+ all : gen
+--- xml2ag/Makefile.am
++++ xml2ag/Makefile.am
+@@ -37,7 +37,7 @@ DISTCLEANFILES = $(DOCFILES) $(nodist_x
+ AM_CPPFLAGS = @INCLIST@ $(LIBXML2_CFLAGS)
+ AM_CFLAGS = @WARN_CFLAGS@
+ AG_ENV = top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" \
+- VERBOSE="$(V)"
++ VERBOSE="$(V)" AGexe="$(AGexe)"
+ RUN_AG = $(AG_ENV) $(SHELL) "${top_srcdir}/build-aux/run-ag.sh"
+ DOC_TIMEOUT = -DLEVEL=section --timeout=`expr $(AG_TIMEOUT) '*' 3`
+
diff --git a/srcpkgs/autogen/patches/cross-compile-fix.patch b/srcpkgs/autogen/patches/cross-compile-fix.patch
new file mode 100644
index 00000000000..698b47aadea
--- /dev/null
+++ b/srcpkgs/autogen/patches/cross-compile-fix.patch
@@ -0,0 +1,13 @@
+diff --git configure configure
+index 884f8ab..e99f92c 100755
+--- configure
++++ configure
+@@ -17324,7 +17324,7 @@ $as_echo_n "checking whether strcspn matches prototype and works... " >&6; }
+ $as_echo_n "(cached) " >&6
+ else
+
+- if test "$cross_compiling" = yes; then :
++ if test "$cross_compiling" = xxx; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
diff --git a/srcpkgs/autogen/patches/no-error.patch b/srcpkgs/autogen/patches/no-error.patch
new file mode 100644
index 00000000000..42c9cc752bf
--- /dev/null
+++ b/srcpkgs/autogen/patches/no-error.patch
@@ -0,0 +1,17 @@
+Description: Do not build with -Werror.
+ It is a time bomb. And fails with Debian's CFLAGS.
+Origin: vendor
+Bug: https://sourceforge.net/p/autogen/bugs/185/
+Last-Update: 2019-09-21
+
+--- configure.ac
++++ configure.ac
+@@ -198,7 +198,7 @@ fi
+ WARN_CFLAGS=
+ test "X${GCC}" = Xyes && {
+ CFLAGS="$CFLAGS -Wno-format-contains-nul -fno-strict-aliasing"
+- WARN_CFLAGS="$CFLAGS "`echo -Wall -Werror -Wcast-align -Wmissing-prototypes \
++ WARN_CFLAGS="$CFLAGS "`echo -Wall -Wcast-align -Wmissing-prototypes \
+ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+ -Wstrict-aliasing=3 -Wextra -Wno-cast-qual`
+ }]dnl -Wconversion -Wsign-conversion -Wstrict-overflow
diff --git a/srcpkgs/autogen/template b/srcpkgs/autogen/template
index fefd2a0f459..a571b6d6293 100644
--- a/srcpkgs/autogen/template
+++ b/srcpkgs/autogen/template
@@ -1,31 +1,39 @@
# Template file for 'autogen'
pkgname=autogen
-version=5.18.4
-revision=7
+version=5.18.16
+revision=1
build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config perl"
+configure_args="--disable-static --disable-dependency-tracking
+ --without-libregex"
+hostmakedepends="automake libtool pkg-config perl"
makedepends="guile guile-devel libxml2-devel gc-devel"
depends="guile perl"
-short_desc="The Automated Program Generator"
+short_desc="Automated Program Generator"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-only"
homepage="http://autogen.sourceforge.net/"
distfiles="${GNU_SITE}/${pkgname}/rel${version}/${pkgname}-${version}.tar.gz"
-checksum=3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d
+checksum=e23c5bbd0ac83079ae2ef6eb3fd1948fecce718ac853025607a3ab0395538406
replaces="autogen-docs>=0 autogen-devel>=0"
-post_install() {
- mv -v ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" autogen"
+ makedepends+=" libatomic_ops-devel"
+fi
+
+pre_configure() {
+ autoreconf -fi
+}
+post_install() {
if [ "$SOURCE_DATE_EPOCH" ]; then
# repackaging libopts to apply correct mtimes
mkdir libopts
- tar xf $DESTDIR/usr/share/autogen/libopts-41.0.16.tar.gz -C libopts
+ tar xf $DESTDIR/usr/share/autogen/libopts-42.1.17.tar.gz -C libopts
find libopts -print0 | xargs -0 touch --date "@$SOURCE_DATE_EPOCH"
cd libopts
- tar cf $DESTDIR/usr/share/autogen/libopts-41.0.16.tar.gz *
+ tar cf $DESTDIR/usr/share/autogen/libopts-42.1.17.tar.gz *
fi
}
next reply other threads:[~2019-11-08 5:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 5:08 voidlinux-github [this message]
2019-11-08 5:16 ` [PR PATCH] [Updated] " voidlinux-github
2019-11-08 5:21 ` voidlinux-github
2019-11-08 5:26 ` voidlinux-github
2019-11-08 5:34 ` voidlinux-github
2019-11-08 16:12 ` voidlinux-github
2019-11-09 4:34 ` [PR PATCH] [Closed]: [ Need testing ] " voidlinux-github
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16219@inbox.vuxu.org \
--to=voidlinux-github@inbox.vuxu.org \
--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).