libpipeline: Update to 1.4.1
This commit is contained in:
parent
d830842f8e
commit
01e3b26a66
@ -1,7 +1,7 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
|
||||
pkgname=('libpipeline' 'libpipeline-devel')
|
||||
pkgver=1.4.0
|
||||
pkgver=1.4.1
|
||||
pkgrel=1
|
||||
pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
|
||||
url="http://libpipeline.nongnu.org/"
|
||||
@ -11,18 +11,21 @@ license=('BSD')
|
||||
makedepends=('openssl-devel' 'zlib-devel')
|
||||
options=('!libtool')
|
||||
source=(https://download.savannah.gnu.org/releases/libpipeline/libpipeline-$pkgver.tar.gz{,.sig}
|
||||
libpipeline-1.3.0-msys2.patch)
|
||||
sha256sums=('79c759e7fbf17b560a72edce3ff9bb308d7720306c2650e4fae541daabb89bb6'
|
||||
libpipeline-1.4.1-update-gnulib.patch
|
||||
libpipeline-1.4.1-msys2.patch)
|
||||
sha256sums=('da46d7b20163aadb9db2faae483f734e9096a7550c84b94029abeab62dd1b9ee'
|
||||
'SKIP'
|
||||
'59e8f8764b5bca6ad690fc3ec94649990cc19a00a833f453e6cde65b0a60bf74')
|
||||
'28f1d5b45822f4f7067650243f89fc6e25aa76d16212fa8997b794b91840750e'
|
||||
'c3fb29cd682b1d977aa896a9ee13e2bcd263754db7c625bd670dc9305747cec8')
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
patch -p1 -i ${srcdir}/libpipeline-1.3.0-msys2.patch
|
||||
patch -p1 -i ${srcdir}/libpipeline-1.4.1-update-gnulib.patch
|
||||
patch -p1 -i ${srcdir}/libpipeline-1.4.1-msys2.patch
|
||||
|
||||
cp -rf build-aux/snippet ${srcdir}/
|
||||
# cp -rf build-aux/snippet ${srcdir}/
|
||||
autoreconf -fi
|
||||
cp -rf ${srcdir}/snippet build-aux/
|
||||
# cp -rf ${srcdir}/snippet build-aux/
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
@ -1,127 +0,0 @@
|
||||
diff -Naur libpipeline-1.3.0-orig/build-aux/config.guess libpipeline-1.3.0/build-aux/config.guess
|
||||
--- libpipeline-1.3.0-orig/build-aux/config.guess 2014-03-26 15:15:54.000000000 +0400
|
||||
+++ libpipeline-1.3.0/build-aux/config.guess 2014-06-14 11:06:04.068200000 +0400
|
||||
@@ -866,6 +866,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 -Naur libpipeline-1.3.0-orig/build-aux/config.rpath libpipeline-1.3.0/build-aux/config.rpath
|
||||
--- libpipeline-1.3.0-orig/build-aux/config.rpath 2014-02-18 17:41:29.000000000 +0400
|
||||
+++ libpipeline-1.3.0/build-aux/config.rpath 2014-06-14 11:06:40.619000000 +0400
|
||||
@@ -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
|
||||
@@ -537,7 +537,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.3.0-orig/gnulib/m4/double-slash-root.m4 libpipeline-1.3.0/gnulib/m4/double-slash-root.m4
|
||||
--- libpipeline-1.3.0-orig/gnulib/m4/double-slash-root.m4 2014-02-18 17:42:59.000000000 +0400
|
||||
+++ libpipeline-1.3.0/gnulib/m4/double-slash-root.m4 2014-06-14 11:07:22.302200000 +0400
|
||||
@@ -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.3.0-orig/gnulib/m4/malloc.m4 libpipeline-1.3.0/gnulib/m4/malloc.m4
|
||||
--- libpipeline-1.3.0-orig/gnulib/m4/malloc.m4 2014-02-18 17:43:00.000000000 +0400
|
||||
+++ libpipeline-1.3.0/gnulib/m4/malloc.m4 2014-06-14 11:08:19.070600000 +0400
|
||||
@@ -30,7 +30,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 -Naur libpipeline-1.3.0-orig/gnulib/m4/printf.m4 libpipeline-1.3.0/gnulib/m4/printf.m4
|
||||
--- libpipeline-1.3.0-orig/gnulib/m4/printf.m4 2014-02-18 17:43:00.000000000 +0400
|
||||
+++ libpipeline-1.3.0/gnulib/m4/printf.m4 2014-06-14 11:13:46.951400000 +0400
|
||||
@@ -735,7 +735,7 @@
|
||||
openbsd*) gl_cv_func_printf_directive_ls="guessing no";;
|
||||
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";;
|
||||
+ cygwin* | 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
|
||||
@@ -812,7 +812,7 @@
|
||||
[
|
||||
changequote(,)dnl
|
||||
case "$host_os" in
|
||||
- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
|
||||
+ cygwin* | 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";;
|
||||
@@ -1464,7 +1464,7 @@
|
||||
darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
||||
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
# Guess yes on Cygwin.
|
||||
- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
|
||||
+ cygwin* | 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 -Naur libpipeline-1.3.0-orig/gnulib/m4/threadlib.m4 libpipeline-1.3.0/gnulib/m4/threadlib.m4
|
||||
--- libpipeline-1.3.0-orig/gnulib/m4/threadlib.m4 2014-02-18 17:43:01.000000000 +0400
|
||||
+++ libpipeline-1.3.0/gnulib/m4/threadlib.m4 2014-06-14 11:14:07.371800000 +0400
|
||||
@@ -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 ;;
|
||||
151
libpipeline/libpipeline-1.4.1-msys2.patch
Normal file
151
libpipeline/libpipeline-1.4.1-msys2.patch
Normal file
@ -0,0 +1,151 @@
|
||||
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/configure libpipeline-1.4.1/configure
|
||||
--- libpipeline-1.4.1.orig/configure 2017-05-17 10:38:38.515625000 +0800
|
||||
+++ libpipeline-1.4.1/configure 2017-05-17 11:02:49.593750000 +0800
|
||||
@@ -15073,7 +15073,7 @@
|
||||
else
|
||||
case "$host_os" in
|
||||
osf*) gl_use_threads=no ;;
|
||||
- cygwin*)
|
||||
+ cygwin* | msys*)
|
||||
case `uname -r` in
|
||||
1.[0-5].*) gl_use_threads=no ;;
|
||||
*) gl_use_threads=yes ;;
|
||||
@@ -16185,7 +16185,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
|
||||
@@ -19252,7 +19252,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 ;;
|
||||
@@ -22890,7 +22890,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/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 ;;
|
||||
37536
libpipeline/libpipeline-1.4.1-update-gnulib.patch
Normal file
37536
libpipeline/libpipeline-1.4.1-update-gnulib.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user