wok-next rev 20131
wvstreams: receipt v2
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue Oct 31 13:33:57 2017 +0100 (2017-10-31) |
| parents | c649c7c1a5b0 |
| children | 856a2d9f3253 |
| files | wvstreams-dev/receipt wvstreams/receipt wvstreams/stuff/patches/package-wvstreams-add-patch-to-fix-build-with-C99-compilers.patch wvstreams/stuff/patches/series |
line diff
1.1 --- a/wvstreams-dev/receipt Tue Oct 31 13:23:41 2017 +0100 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,21 +0,0 @@ 1.4 -# SliTaz package receipt. 1.5 - 1.6 -PACKAGE="wvstreams-dev" 1.7 -VERSION="4.6.1" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="wvstreams devel files." 1.10 -MAINTAINER="jozee@slitaz.org" 1.11 -LICENSE="GPL2" 1.12 -WANTED="wvstreams" 1.13 -WEB_SITE="http://wvstreams.googlecode.com" 1.14 - 1.15 -DEPENDS="pkg-config" 1.16 - 1.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.18 -genpkg_rules() 1.19 -{ 1.20 - mkdir -p $fs/usr/lib 1.21 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 1.22 - cp -a $install/usr/lib/*.*a $fs/usr/lib 1.23 - cp -a $install/usr/include/ $fs/usr 1.24 -}
2.1 --- a/wvstreams/receipt Tue Oct 31 13:23:41 2017 +0100 2.2 +++ b/wvstreams/receipt Tue Oct 31 13:33:57 2017 +0100 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="wvstreams" 2.8 VERSION="4.6.1" 2.9 @@ -9,10 +9,9 @@ 2.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.11 WEB_SITE="http://wvstreams.googlecode.com" 2.12 WGET_URL="http://wvstreams.googlecode.com/files/$TARBALL" 2.13 -TAGS="network 3G" 2.14 2.15 -DEPENDS="ppp libssl xplc readline" 2.16 BUILD_DEPENDS="ppp-dev openssl-dev xplc-dev readline-dev bash zlib-dev" 2.17 +SPLIT="wvstreams wvstreams-dev" 2.18 2.19 # Rules to configure and make the package. 2.20 compile_rules() 2.21 @@ -33,16 +32,30 @@ 2.22 # Rules to gen a SliTaz package suitable for Tazpkg. 2.23 genpkg_rules() 2.24 { 2.25 - mkdir -p $fs/usr/lib $fs/etc $fs/var 2.26 - cp -a $install/usr/bin $fs/usr 2.27 - cp -a $install/usr/lib/*.so* $fs/usr/lib 2.28 - cp -a $install/usr/lib/valgrind $fs/usr/lib 2.29 - cp -a $install/usr/sbin $fs/usr 2.30 - cp -a $install/usr/etc/* $fs/etc 2.31 - cp -a $install/usr/var/* $fs/var 2.32 + case $PACKAGE in 2.33 + wvstreams) 2.34 + TAGS="network 3G" 2.35 + DEPENDS="ppp libssl xplc readline" 2.36 + mkdir -p $fs/usr/lib $fs/etc $fs/var 2.37 + cp -a $install/usr/bin $fs/usr 2.38 + cp -a $install/usr/lib/*.so* $fs/usr/lib 2.39 + cp -a $install/usr/lib/valgrind $fs/usr/lib 2.40 + cp -a $install/usr/sbin $fs/usr 2.41 + cp -a $install/usr/etc/* $fs/etc 2.42 + cp -a $install/usr/var/* $fs/var 2.43 + ;; 2.44 + wvstreams-dev) 2.45 + CAT="development|wvstreams devel files." 2.46 + DEPENDS="pkg-config" 2.47 + mkdir -p $fs/usr/lib 2.48 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 2.49 + cp -a $install/usr/lib/*.*a $fs/usr/lib 2.50 + cp -a $install/usr/include/ $fs/usr 2.51 + ;; 2.52 + esac 2.53 } 2.54 2.55 -post_remove() 2.56 +post_remove_wvstreams() 2.57 { 2.58 rm -rf "$1/etc/ppp/peers/wvdial" 2.59 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/wvstreams/stuff/patches/package-wvstreams-add-patch-to-fix-build-with-C99-compilers.patch Tue Oct 31 13:33:57 2017 +0100 3.3 @@ -0,0 +1,170 @@ 3.4 +From patchwork Fri Sep 23 21:42:27 2016 3.5 +Content-Type: text/plain; charset="utf-8" 3.6 +MIME-Version: 1.0 3.7 +Content-Transfer-Encoding: 8bit 3.8 +Subject: package/wvstreams: add patch to fix build with C99 compilers 3.9 +X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= 3.10 + <joerg.krause@embedded.rocks> 3.11 +X-Patchwork-Id: 674238 3.12 +Message-Id: <20160923214227.12888-1-joerg.krause@embedded.rocks> 3.13 +To: buildroot@buildroot.org 3.14 +Date: Fri, 23 Sep 2016 23:42:27 +0200 3.15 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks> 3.16 +List-Id: Discussion and development of buildroot <buildroot.busybox.net> 3.17 + 3.18 +wvstreams uses a bundled version of argp. Compiling argp fails for all 3.19 +compilers not using the C89 standard by default: 3.20 + 3.21 +""" 3.22 +In file included from argp-fmtstream.c:35:0: 3.23 +argp-namefrob.h:62:32: error: redefinition of ‘argp_fmtstream_write’ 3.24 + #define __argp_fmtstream_write argp_fmtstream_write 3.25 + ^ 3.26 +argp-fmtstream.c:395:1: note: in expansion of macro 3.27 +‘__argp_fmtstream_write’ 3.28 + __argp_fmtstream_write (argp_fmtstream_t __fs, 3.29 + ^ 3.30 +In file included from argp-fmtstream.c:34:0: 3.31 +argp-fmtstream.h:209:32: note: previous definition of 3.32 +‘argp_fmtstream_write’ was here 3.33 + #define __argp_fmtstream_write argp_fmtstream_write 3.34 + ^ 3.35 +argp-fmtstream.h:223:1: note: in expansion of macro 3.36 +‘__argp_fmtstream_write’ 3.37 + __argp_fmtstream_write (argp_fmtstream_t __fs, 3.38 + ^ 3.39 +""" 3.40 + 3.41 +The issue is that C99 changed inline semantics. This patch takes these 3.42 +changes into account and allows to build the bundled argp and therefore 3.43 +wvstreams with non-C89-compilers. 3.44 + 3.45 +Note, that wvstreams is not maintained anymore. Last activity was on 3.46 +Github was 2011, the current version 1.6.1 dates from 2009. 3.47 + 3.48 +Fetch-from: http://review.gluster.org/6034 3.49 + 3.50 +Fixes: 3.51 +http://autobuild.buildroot.net/results/f01/f0166f030875ecaf0d757790de6361339071831e/ 3.52 +http://autobuild.buildroot.net/results/32b/32b4eba8c7cbe8a3b1cde2d67f1af3f913fcc292/ 3.53 +http://autobuild.buildroot.net/results/38f/38fefa126596c6e267ffaf0f2dd9c5e3dcf09aff/ 3.54 +http://autobuild.buildroot.net/results/ea2/ea223c8a4f817541f55aa36c47b159a316031bff/ 3.55 +.. and many more. 3.56 + 3.57 +Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> 3.58 +--- 3.59 + .../0006-fix-build-with-C99-compilers.patch | 105 +++++++++++++++++++++ 3.60 + 1 file changed, 105 insertions(+) 3.61 + create mode 100644 package/wvstreams/0006-fix-build-with-C99-compilers.patch 3.62 + 3.63 +diff --git a/package/wvstreams/0006-fix-build-with-C99-compilers.patch b/package/wvstreams/0006-fix-build-with-C99-compilers.patch 3.64 +new file mode 100644 3.65 +index 0000000..2bd34a0 3.66 +--- /dev/null 3.67 ++++ b/package/wvstreams/0006-fix-build-with-C99-compilers.patch 3.68 +@@ -0,0 +1,105 @@ 3.69 ++From b2dfa011a3fdcb7d22764d143517d0fbd1c2a201 Mon Sep 17 00:00:00 2001 3.70 ++From: Emmanuel Dreyfus <manu@netbsd.org> 3.71 ++Date: Wed, 22 Jan 2014 14:47:23 +0100 3.72 ++Subject: [PATCH] Fix build with C99 compilers 3.73 ++ 3.74 ++wvstreams uses a bundled version of argp. Compiling argp fails for all compilers 3.75 ++not using the C89 standard by default: 3.76 ++ 3.77 ++""" 3.78 ++In file included from argp-fmtstream.c:35:0: 3.79 ++argp-namefrob.h:62:32: error: redefinition of ‘argp_fmtstream_write’ 3.80 ++ #define __argp_fmtstream_write argp_fmtstream_write 3.81 ++ ^ 3.82 ++argp-fmtstream.c:395:1: note: in expansion of macro ‘__argp_fmtstream_write’ 3.83 ++ __argp_fmtstream_write (argp_fmtstream_t __fs, 3.84 ++ ^ 3.85 ++In file included from argp-fmtstream.c:34:0: 3.86 ++argp-fmtstream.h:209:32: note: previous definition of ‘argp_fmtstream_write’ was here 3.87 ++ #define __argp_fmtstream_write argp_fmtstream_write 3.88 ++ ^ 3.89 ++argp-fmtstream.h:223:1: note: in expansion of macro ‘__argp_fmtstream_write’ 3.90 ++ __argp_fmtstream_write (argp_fmtstream_t __fs, 3.91 ++ ^ 3.92 ++""" 3.93 ++ 3.94 ++The issue is that C99 changed inline semantics. This patch allows to build 3.95 ++argp with non-C89-compilers. 3.96 ++ 3.97 ++Fetch-from: http://review.gluster.org/6034 3.98 ++ 3.99 ++Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> 3.100 ++Reviewed-by: Harshavardhana <harsha@harshavardhana.net> 3.101 ++Tested-by: Gluster Build System <jenkins@build.gluster.com> 3.102 ++ 3.103 ++[Adapt paths for wvstreams. Add commit message.] 3.104 ++Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> 3.105 ++--- 3.106 ++ 3.107 ++diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c 3.108 ++index 7f79285..494b6b3 100644 3.109 ++--- a/argp/argp-fmtstream.c 3.110 +++++ b/argp/argp-fmtstream.c 3.111 ++@@ -389,6 +389,7 @@ 3.112 ++ weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) 3.113 ++ #endif 3.114 ++ 3.115 +++#if __STDC_VERSION__ - 199900L < 1 3.116 ++ /* Duplicate the inline definitions in argp-fmtstream.h, for compilers 3.117 ++ * that don't do inlining. */ 3.118 ++ size_t 3.119 ++@@ -471,5 +472,6 @@ 3.120 ++ __argp_fmtstream_update (__fs); 3.121 ++ return __fs->point_col >= 0 ? __fs->point_col : 0; 3.122 ++ } 3.123 +++#endif /* __STDC_VERSION__ - 199900L < 1 */ 3.124 ++ 3.125 ++ #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ 3.126 ++diff --git a/argp/argp-fmtstream.h b/argp/argp-fmtstream.h 3.127 ++index e797b11..828f435 100644 3.128 ++--- a/argp/argp-fmtstream.h 3.129 +++++ b/argp/argp-fmtstream.h 3.130 ++@@ -153,6 +153,7 @@ 3.131 ++ __const char *__fmt, ...) 3.132 ++ PRINTF_STYLE(2,3); 3.133 ++ 3.134 +++#if __STDC_VERSION__ - 199900L < 1 3.135 ++ extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); 3.136 ++ extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); 3.137 ++ 3.138 ++@@ -163,6 +164,7 @@ 3.139 ++ __const char *__str, size_t __len); 3.140 ++ extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, 3.141 ++ __const char *__str, size_t __len); 3.142 +++#endif /* __STDC_VERSION__ - 199900L < 1 */ 3.143 ++ 3.144 ++ /* Access macros for various bits of state. */ 3.145 ++ #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) 3.146 ++@@ -172,6 +174,7 @@ 3.147 ++ #define __argp_fmtstream_rmargin argp_fmtstream_rmargin 3.148 ++ #define __argp_fmtstream_wmargin argp_fmtstream_wmargin 3.149 ++ 3.150 +++#if __STDC_VERSION__ - 199900L < 1 3.151 ++ /* Set __FS's left margin to LMARGIN and return the old value. */ 3.152 ++ extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, 3.153 ++ size_t __lmargin); 3.154 ++@@ -193,6 +196,7 @@ 3.155 ++ /* Return the column number of the current output point in __FS. */ 3.156 ++ extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); 3.157 ++ extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); 3.158 +++#endif /* __STDC_VERSION__ - 199900L < 1 */ 3.159 ++ 3.160 ++ /* Internal routines. */ 3.161 ++ extern void _argp_fmtstream_update (argp_fmtstream_t __fs); 3.162 ++@@ -216,7 +220,11 @@ 3.163 ++ #endif 3.164 ++ 3.165 ++ #ifndef ARGP_FS_EI 3.166 +++#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) 3.167 ++ #define ARGP_FS_EI extern inline 3.168 +++#else 3.169 +++#define ARGP_FS_EI inline 3.170 +++#endif 3.171 ++ #endif 3.172 ++ 3.173 ++ ARGP_FS_EI size_t