# HG changeset patch # User Pascal Bellard # Date 1509453237 -3600 # Node ID 4f615ac29298cec659018ca882deb193b739bf1c # Parent c649c7c1a5b02154bf5943373f7726438b8273f2 wvstreams: receipt v2 diff -r c649c7c1a5b0 -r 4f615ac29298 wvstreams-dev/receipt --- a/wvstreams-dev/receipt Tue Oct 31 13:23:41 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="wvstreams-dev" -VERSION="4.6.1" -CATEGORY="development" -SHORT_DESC="wvstreams devel files." -MAINTAINER="jozee@slitaz.org" -LICENSE="GPL2" -WANTED="wvstreams" -WEB_SITE="http://wvstreams.googlecode.com" - -DEPENDS="pkg-config" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - cp -a $install/usr/lib/*.*a $fs/usr/lib - cp -a $install/usr/include/ $fs/usr -} diff -r c649c7c1a5b0 -r 4f615ac29298 wvstreams/receipt --- a/wvstreams/receipt Tue Oct 31 13:23:41 2017 +0100 +++ b/wvstreams/receipt Tue Oct 31 13:33:57 2017 +0100 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="wvstreams" VERSION="4.6.1" @@ -9,10 +9,9 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://wvstreams.googlecode.com" WGET_URL="http://wvstreams.googlecode.com/files/$TARBALL" -TAGS="network 3G" -DEPENDS="ppp libssl xplc readline" BUILD_DEPENDS="ppp-dev openssl-dev xplc-dev readline-dev bash zlib-dev" +SPLIT="wvstreams wvstreams-dev" # Rules to configure and make the package. compile_rules() @@ -33,16 +32,30 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib $fs/etc $fs/var - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/usr/lib/valgrind $fs/usr/lib - cp -a $install/usr/sbin $fs/usr - cp -a $install/usr/etc/* $fs/etc - cp -a $install/usr/var/* $fs/var + case $PACKAGE in + wvstreams) + TAGS="network 3G" + DEPENDS="ppp libssl xplc readline" + mkdir -p $fs/usr/lib $fs/etc $fs/var + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib/*.so* $fs/usr/lib + cp -a $install/usr/lib/valgrind $fs/usr/lib + cp -a $install/usr/sbin $fs/usr + cp -a $install/usr/etc/* $fs/etc + cp -a $install/usr/var/* $fs/var + ;; + wvstreams-dev) + CAT="development|wvstreams devel files." + DEPENDS="pkg-config" + mkdir -p $fs/usr/lib + cp -a $install/usr/lib/pkgconfig $fs/usr/lib + cp -a $install/usr/lib/*.*a $fs/usr/lib + cp -a $install/usr/include/ $fs/usr + ;; + esac } -post_remove() +post_remove_wvstreams() { rm -rf "$1/etc/ppp/peers/wvdial" } diff -r c649c7c1a5b0 -r 4f615ac29298 wvstreams/stuff/patches/package-wvstreams-add-patch-to-fix-build-with-C99-compilers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wvstreams/stuff/patches/package-wvstreams-add-patch-to-fix-build-with-C99-compilers.patch Tue Oct 31 13:33:57 2017 +0100 @@ -0,0 +1,170 @@ +From patchwork Fri Sep 23 21:42:27 2016 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: package/wvstreams: add patch to fix build with C99 compilers +X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= + +X-Patchwork-Id: 674238 +Message-Id: <20160923214227.12888-1-joerg.krause@embedded.rocks> +To: buildroot@buildroot.org +Date: Fri, 23 Sep 2016 23:42:27 +0200 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +List-Id: Discussion and development of buildroot + +wvstreams uses a bundled version of argp. Compiling argp fails for all +compilers not using the C89 standard by default: + +""" +In file included from argp-fmtstream.c:35:0: +argp-namefrob.h:62:32: error: redefinition of ‘argp_fmtstream_write’ + #define __argp_fmtstream_write argp_fmtstream_write + ^ +argp-fmtstream.c:395:1: note: in expansion of macro +‘__argp_fmtstream_write’ + __argp_fmtstream_write (argp_fmtstream_t __fs, + ^ +In file included from argp-fmtstream.c:34:0: +argp-fmtstream.h:209:32: note: previous definition of +‘argp_fmtstream_write’ was here + #define __argp_fmtstream_write argp_fmtstream_write + ^ +argp-fmtstream.h:223:1: note: in expansion of macro +‘__argp_fmtstream_write’ + __argp_fmtstream_write (argp_fmtstream_t __fs, + ^ +""" + +The issue is that C99 changed inline semantics. This patch takes these +changes into account and allows to build the bundled argp and therefore +wvstreams with non-C89-compilers. + +Note, that wvstreams is not maintained anymore. Last activity was on +Github was 2011, the current version 1.6.1 dates from 2009. + +Fetch-from: http://review.gluster.org/6034 + +Fixes: +http://autobuild.buildroot.net/results/f01/f0166f030875ecaf0d757790de6361339071831e/ +http://autobuild.buildroot.net/results/32b/32b4eba8c7cbe8a3b1cde2d67f1af3f913fcc292/ +http://autobuild.buildroot.net/results/38f/38fefa126596c6e267ffaf0f2dd9c5e3dcf09aff/ +http://autobuild.buildroot.net/results/ea2/ea223c8a4f817541f55aa36c47b159a316031bff/ +.. and many more. + +Signed-off-by: Jörg Krause +--- + .../0006-fix-build-with-C99-compilers.patch | 105 +++++++++++++++++++++ + 1 file changed, 105 insertions(+) + create mode 100644 package/wvstreams/0006-fix-build-with-C99-compilers.patch + +diff --git a/package/wvstreams/0006-fix-build-with-C99-compilers.patch b/package/wvstreams/0006-fix-build-with-C99-compilers.patch +new file mode 100644 +index 0000000..2bd34a0 +--- /dev/null ++++ b/package/wvstreams/0006-fix-build-with-C99-compilers.patch +@@ -0,0 +1,105 @@ ++From b2dfa011a3fdcb7d22764d143517d0fbd1c2a201 Mon Sep 17 00:00:00 2001 ++From: Emmanuel Dreyfus ++Date: Wed, 22 Jan 2014 14:47:23 +0100 ++Subject: [PATCH] Fix build with C99 compilers ++ ++wvstreams uses a bundled version of argp. Compiling argp fails for all compilers ++not using the C89 standard by default: ++ ++""" ++In file included from argp-fmtstream.c:35:0: ++argp-namefrob.h:62:32: error: redefinition of ‘argp_fmtstream_write’ ++ #define __argp_fmtstream_write argp_fmtstream_write ++ ^ ++argp-fmtstream.c:395:1: note: in expansion of macro ‘__argp_fmtstream_write’ ++ __argp_fmtstream_write (argp_fmtstream_t __fs, ++ ^ ++In file included from argp-fmtstream.c:34:0: ++argp-fmtstream.h:209:32: note: previous definition of ‘argp_fmtstream_write’ was here ++ #define __argp_fmtstream_write argp_fmtstream_write ++ ^ ++argp-fmtstream.h:223:1: note: in expansion of macro ‘__argp_fmtstream_write’ ++ __argp_fmtstream_write (argp_fmtstream_t __fs, ++ ^ ++""" ++ ++The issue is that C99 changed inline semantics. This patch allows to build ++argp with non-C89-compilers. ++ ++Fetch-from: http://review.gluster.org/6034 ++ ++Signed-off-by: Emmanuel Dreyfus ++Reviewed-by: Harshavardhana ++Tested-by: Gluster Build System ++ ++[Adapt paths for wvstreams. Add commit message.] ++Signed-off-by: Jörg Krause ++--- ++ ++diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c ++index 7f79285..494b6b3 100644 ++--- a/argp/argp-fmtstream.c +++++ b/argp/argp-fmtstream.c ++@@ -389,6 +389,7 @@ ++ weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) ++ #endif ++ +++#if __STDC_VERSION__ - 199900L < 1 ++ /* Duplicate the inline definitions in argp-fmtstream.h, for compilers ++ * that don't do inlining. */ ++ size_t ++@@ -471,5 +472,6 @@ ++ __argp_fmtstream_update (__fs); ++ return __fs->point_col >= 0 ? __fs->point_col : 0; ++ } +++#endif /* __STDC_VERSION__ - 199900L < 1 */ ++ ++ #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ ++diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h ++index e797b11..828f435 100644 ++--- a/argp/argp-fmtstream.h +++++ b/argp/argp-fmtstream.h ++@@ -153,6 +153,7 @@ ++ __const char *__fmt, ...) ++ PRINTF_STYLE(2,3); ++ +++#if __STDC_VERSION__ - 199900L < 1 ++ extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); ++ extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); ++ ++@@ -163,6 +164,7 @@ ++ __const char *__str, size_t __len); ++ extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, ++ __const char *__str, size_t __len); +++#endif /* __STDC_VERSION__ - 199900L < 1 */ ++ ++ /* Access macros for various bits of state. */ ++ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) ++@@ -172,6 +174,7 @@ ++ #define __argp_fmtstream_rmargin argp_fmtstream_rmargin ++ #define __argp_fmtstream_wmargin argp_fmtstream_wmargin ++ +++#if __STDC_VERSION__ - 199900L < 1 ++ /* Set __FS's left margin to LMARGIN and return the old value. */ ++ extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, ++ size_t __lmargin); ++@@ -193,6 +196,7 @@ ++ /* Return the column number of the current output point in __FS. */ ++ extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); ++ extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); +++#endif /* __STDC_VERSION__ - 199900L < 1 */ ++ ++ /* Internal routines. */ ++ extern void _argp_fmtstream_update (argp_fmtstream_t __fs); ++@@ -216,7 +220,11 @@ ++ #endif ++ ++ #ifndef ARGP_FS_EI +++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) ++ #define ARGP_FS_EI extern inline +++#else +++#define ARGP_FS_EI inline +++#endif ++ #endif ++ ++ ARGP_FS_EI size_t diff -r c649c7c1a5b0 -r 4f615ac29298 wvstreams/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wvstreams/stuff/patches/series Tue Oct 31 13:33:57 2017 +0100 @@ -0,0 +1,1 @@ +package-wvstreams-add-patch-to-fix-build-with-C99-compilers.patch