libpipeline: Update to 1.5.1
This commit is contained in:
Alexey Pavlov
parent
93e338b43c
commit
ce810a3eef
@ -1,7 +1,7 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('libpipeline' 'libpipeline-devel')
|
||||
pkgver=1.5.0
|
||||
pkgver=1.5.1
|
||||
pkgrel=1
|
||||
pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
|
||||
url="http://libpipeline.nongnu.org/"
|
||||
@ -10,18 +10,15 @@ arch=('i686' 'x86_64')
|
||||
license=('BSD')
|
||||
makedepends=('openssl-devel' 'zlib-devel')
|
||||
options=('!libtool')
|
||||
source=(https://download.savannah.gnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz{,.sig}
|
||||
libpipeline-1.5.0-gnulib.patch
|
||||
libpipeline-1.4.1-msys2.patch)
|
||||
sha256sums=('0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b'
|
||||
source=(https://download.savannah.gnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz{,.asc}
|
||||
libpipeline-1.5.1-msys2.patch)
|
||||
sha256sums=('d633706b7d845f08b42bc66ddbe845d57e726bf89298e2cee29f09577e2f902f'
|
||||
'SKIP'
|
||||
'0559526eecb02415f210c6c0d2b0a5b5694ffe8637b74840684433f8cdb1bd37'
|
||||
'ca3d2b15f0da4b593ca4a6b25b7555a96f3a565d75edf11b93cd97ca1b831265')
|
||||
'd3e18828f4918260329984139e890ab79f434ef601eec9cd3a69450d3b857621')
|
||||
|
||||
prepare() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
patch -p1 -i ${srcdir}/libpipeline-1.5.0-gnulib.patch
|
||||
patch -p1 -i ${srcdir}/libpipeline-1.4.1-msys2.patch
|
||||
patch -p1 -i ${srcdir}/libpipeline-1.5.1-msys2.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
diff -durN libpipeline-1.4.1.orig/build-aux/config.guess libpipeline-1.4.1/build-aux/config.guess
|
||||
--- libpipeline-1.4.1.orig/build-aux/config.guess 2017-05-17 10:35:06.968750000 +0800
|
||||
+++ libpipeline-1.4.1/build-aux/config.guess 2017-05-17 10:58:47.937500000 +0800
|
||||
@@ -891,6 +891,9 @@
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
echo x86_64-unknown-cygwin
|
||||
exit ;;
|
||||
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
||||
+ echo x86_64-unknown-msys
|
||||
+ exit ;;
|
||||
p*:CYGWIN*:*)
|
||||
echo powerpcle-unknown-cygwin
|
||||
exit ;;
|
||||
diff -durN libpipeline-1.4.1.orig/build-aux/config.rpath libpipeline-1.4.1/build-aux/config.rpath
|
||||
--- libpipeline-1.4.1.orig/build-aux/config.rpath 2017-05-17 10:35:06.968750000 +0800
|
||||
+++ libpipeline-1.4.1/build-aux/config.rpath 2017-05-17 10:58:47.937500000 +0800
|
||||
@@ -57,7 +57,7 @@
|
||||
aix*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
@@ -149,7 +149,7 @@
|
||||
hardcode_minus_L=no
|
||||
|
||||
case "$host_os" in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -198,7 +198,7 @@
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@@ -348,7 +348,7 @@
|
||||
;;
|
||||
bsdi[45]*)
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -533,7 +533,7 @@
|
||||
bsdi[45]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
diff -durN libpipeline-1.4.1.orig/gnulib/m4/double-slash-root.m4 libpipeline-1.4.1/gnulib/m4/double-slash-root.m4
|
||||
--- libpipeline-1.4.1.orig/gnulib/m4/double-slash-root.m4 2017-05-17 10:35:41.640625000 +0800
|
||||
+++ libpipeline-1.4.1/gnulib/m4/double-slash-root.m4 2017-05-17 11:04:32.203125000 +0800
|
||||
@@ -16,7 +16,7 @@
|
||||
# special semantics and is distinct from /, please report it to
|
||||
# <bug-gnulib@gnu.org>.
|
||||
case $host in
|
||||
- *-cygwin | i370-ibm-openedition)
|
||||
+ *-cygwin | *-msys | i370-ibm-openedition)
|
||||
gl_cv_double_slash_root=yes ;;
|
||||
*)
|
||||
# Be optimistic and assume that / and // are the same when we
|
||||
diff -durN libpipeline-1.4.1.orig/gnulib/m4/malloc.m4 libpipeline-1.4.1/gnulib/m4/malloc.m4
|
||||
--- libpipeline-1.4.1.orig/gnulib/m4/malloc.m4 2017-05-17 10:35:49.015625000 +0800
|
||||
+++ libpipeline-1.4.1/gnulib/m4/malloc.m4 2017-05-17 11:06:30.671875000 +0800
|
||||
@@ -33,7 +33,7 @@
|
||||
[case "$host_os" in
|
||||
# Guess yes on platforms where we know the result.
|
||||
*-gnu* | freebsd* | netbsd* | openbsd* \
|
||||
- | hpux* | solaris* | cygwin* | mingw*)
|
||||
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
||||
ac_cv_func_malloc_0_nonnull=yes ;;
|
||||
# If we don't know, assume the worst.
|
||||
*) ac_cv_func_malloc_0_nonnull=no ;;
|
||||
diff -durN libpipeline-1.4.1.orig/gnulib/m4/printf.m4 libpipeline-1.4.1/gnulib/m4/printf.m4
|
||||
--- libpipeline-1.4.1.orig/gnulib/m4/printf.m4 2017-05-17 10:35:52.421875000 +0800
|
||||
+++ libpipeline-1.4.1/gnulib/m4/printf.m4 2017-05-17 11:07:41.343750000 +0800
|
||||
@@ -730,6 +730,7 @@
|
||||
irix*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
+ msys*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
*) gl_cv_func_printf_directive_ls="guessing yes";;
|
||||
esac
|
||||
@@ -807,6 +808,7 @@
|
||||
changequote(,)dnl
|
||||
case "$host_os" in
|
||||
cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
+ msys*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
*) gl_cv_func_printf_flag_grouping="guessing yes";;
|
||||
@@ -1459,6 +1461,8 @@
|
||||
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
# Guess yes on Cygwin.
|
||||
cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
+ # Guess yes on msys.
|
||||
+ msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
# Guess yes on Solaris >= 2.6.
|
||||
solaris2.[0-5] | solaris2.[0-5].*)
|
||||
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
||||
diff -durN libpipeline-1.4.1.orig/gnulib/m4/threadlib.m4 libpipeline-1.4.1/gnulib/m4/threadlib.m4
|
||||
--- libpipeline-1.4.1.orig/gnulib/m4/threadlib.m4 2017-05-17 10:36:01.656250000 +0800
|
||||
+++ libpipeline-1.4.1/gnulib/m4/threadlib.m4 2017-05-17 11:08:22.250000000 +0800
|
||||
@@ -68,7 +68,7 @@
|
||||
dnl bugs that lead to endless loops or crashes. See
|
||||
dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
|
||||
osf*) gl_use_threads=no ;;
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
case `uname -r` in
|
||||
1.[0-5].*) gl_use_threads=no ;;
|
||||
*) gl_use_threads=yes ;;
|
||||
File diff suppressed because it is too large
Load Diff
142
libpipeline/libpipeline-1.5.1-msys2.patch
Normal file
142
libpipeline/libpipeline-1.5.1-msys2.patch
Normal file
@ -0,0 +1,142 @@
|
||||
diff -Naur libpipeline-1.5.1-orig/build-aux/ar-lib libpipeline-1.5.1/build-aux/ar-lib
|
||||
--- libpipeline-1.5.1-orig/build-aux/ar-lib 2019-01-27 17:02:33.000000000 +0300
|
||||
+++ libpipeline-1.5.1/build-aux/ar-lib 2019-02-20 09:02:03.388256200 +0300
|
||||
@@ -56,6 +56,9 @@
|
||||
CYGWIN*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
+ MSYS*)
|
||||
+ file_conv=cygwin
|
||||
+ ;;
|
||||
*)
|
||||
file_conv=wine
|
||||
;;
|
||||
@@ -68,6 +71,9 @@
|
||||
cygwin)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
+ msys)
|
||||
+ file=`cygpath -m "$file" || echo "$file"`
|
||||
+ ;;
|
||||
wine)
|
||||
file=`winepath -w "$file" || echo "$file"`
|
||||
;;
|
||||
diff -Naur libpipeline-1.5.1-orig/build-aux/compile libpipeline-1.5.1/build-aux/compile
|
||||
--- libpipeline-1.5.1-orig/build-aux/compile 2019-01-27 17:02:33.000000000 +0300
|
||||
+++ libpipeline-1.5.1/build-aux/compile 2019-02-20 09:02:55.572548100 +0300
|
||||
@@ -56,6 +56,9 @@
|
||||
CYGWIN*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
+ MSYS*)
|
||||
+ file_conv=cygwin
|
||||
+ ;;
|
||||
*)
|
||||
file_conv=wine
|
||||
;;
|
||||
@@ -70,6 +73,9 @@
|
||||
cygwin/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
+ msys/*)
|
||||
+ file=`cygpath -m "$file" || echo "$file"`
|
||||
+ ;;
|
||||
wine/*)
|
||||
file=`winepath -w "$file" || echo "$file"`
|
||||
;;
|
||||
diff -Naur libpipeline-1.5.1-orig/build-aux/config.guess libpipeline-1.5.1/build-aux/config.guess
|
||||
--- libpipeline-1.5.1-orig/build-aux/config.guess 2019-01-27 16:48:01.000000000 +0300
|
||||
+++ libpipeline-1.5.1/build-aux/config.guess 2019-02-20 09:03:27.399604100 +0300
|
||||
@@ -896,6 +896,9 @@
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
echo x86_64-pc-cygwin
|
||||
exit ;;
|
||||
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
||||
+ echo x86_64-pc-msys
|
||||
+ exit ;;
|
||||
prep*:SunOS:5.*:*)
|
||||
echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
|
||||
exit ;;
|
||||
diff -Naur libpipeline-1.5.1-orig/build-aux/config.rpath libpipeline-1.5.1/build-aux/config.rpath
|
||||
--- libpipeline-1.5.1-orig/build-aux/config.rpath 2019-01-05 14:20:49.000000000 +0300
|
||||
+++ libpipeline-1.5.1/build-aux/config.rpath 2019-02-20 08:59:56.838833800 +0300
|
||||
@@ -57,7 +57,7 @@
|
||||
aix*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
@@ -149,7 +149,7 @@
|
||||
hardcode_minus_L=no
|
||||
|
||||
case "$host_os" in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -198,7 +198,7 @@
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@@ -348,7 +348,7 @@
|
||||
;;
|
||||
bsdi[45]*)
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -533,7 +533,7 @@
|
||||
bsdi[45]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
diff -Naur libpipeline-1.5.1-orig/gl/m4/double-slash-root.m4 libpipeline-1.5.1/gl/m4/double-slash-root.m4
|
||||
--- libpipeline-1.5.1-orig/gl/m4/double-slash-root.m4 2019-01-05 14:20:51.000000000 +0300
|
||||
+++ libpipeline-1.5.1/gl/m4/double-slash-root.m4 2019-02-20 09:04:33.340328000 +0300
|
||||
@@ -16,7 +16,7 @@
|
||||
# special semantics and is distinct from /, please report it to
|
||||
# <bug-gnulib@gnu.org>.
|
||||
case $host in
|
||||
- *-cygwin | i370-ibm-openedition)
|
||||
+ *-cygwin | *-msys | i370-ibm-openedition)
|
||||
gl_cv_double_slash_root=yes ;;
|
||||
*)
|
||||
# Be optimistic and assume that / and // are the same when we
|
||||
diff -Naur libpipeline-1.5.1-orig/gl/m4/malloc.m4 libpipeline-1.5.1/gl/m4/malloc.m4
|
||||
--- libpipeline-1.5.1-orig/gl/m4/malloc.m4 2019-01-05 14:20:51.000000000 +0300
|
||||
+++ libpipeline-1.5.1/gl/m4/malloc.m4 2019-02-20 09:23:03.458478800 +0300
|
||||
@@ -33,7 +33,7 @@
|
||||
[case "$host_os" in
|
||||
# Guess yes on platforms where we know the result.
|
||||
*-gnu* | gnu* | freebsd* | netbsd* | openbsd* \
|
||||
- | hpux* | solaris* | cygwin* | mingw*)
|
||||
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
||||
ac_cv_func_malloc_0_nonnull=yes ;;
|
||||
# If we don't know, assume the worst.
|
||||
*) ac_cv_func_malloc_0_nonnull=no ;;
|
||||
diff -Naur libpipeline-1.5.1-orig/gl/m4/printf.m4 libpipeline-1.5.1/gl/m4/printf.m4
|
||||
--- libpipeline-1.5.1-orig/gl/m4/printf.m4 2019-01-27 16:48:24.000000000 +0300
|
||||
+++ libpipeline-1.5.1/gl/m4/printf.m4 2019-02-20 09:23:33.878532200 +0300
|
||||
@@ -785,6 +785,7 @@
|
||||
irix*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
+ msys*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
# Guess no on Android.
|
||||
linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
Loading…
x
Reference in New Issue
Block a user