From a161ef06e06e619fe3ad91d398893a0de2dfc273 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Fri, 24 Oct 2014 11:20:13 +0400 Subject: [PATCH] diffutils: Cleanup msysize patch --- diffutils/PKGBUILD | 2 +- diffutils/diffutils-3.3-msys2.patch | 91 ----------------------------- 2 files changed, 1 insertion(+), 92 deletions(-) diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD index cf132af6..b894df21 100644 --- a/diffutils/PKGBUILD +++ b/diffutils/PKGBUILD @@ -14,7 +14,7 @@ source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} diffutils-3.3-msys2.patch) md5sums=('99180208ec2a82ce71f55b0d7389f1b3' 'SKIP' - '986a8b43cc70dd2493c869776559b202') + '4e0f74c2a7968d1a7ad4a39b525dbd1c') prepare() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/diffutils/diffutils-3.3-msys2.patch b/diffutils/diffutils-3.3-msys2.patch index 2645cb82..20f719c2 100644 --- a/diffutils/diffutils-3.3-msys2.patch +++ b/diffutils/diffutils-3.3-msys2.patch @@ -90,97 +90,6 @@ diff -Naur diffutils-3.3-orig/build-aux/config.rpath diffutils-3.3/build-aux/con shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur diffutils-3.3-orig/configure diffutils-3.3/configure ---- diffutils-3.3-orig/configure 2013-03-24 18:03:03.000000000 +0000 -+++ diffutils-3.3/configure 2013-05-08 10:40:07.202148400 +0000 -@@ -8937,7 +8937,7 @@ - # special semantics and is distinct from /, please report it to - # . - 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 -@@ -13862,7 +13862,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 ;; -@@ -16357,7 +16357,7 @@ - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_getcwd_null="guessing yes";; -+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; - esac -@@ -16629,7 +16629,7 @@ - - case "$host_os" in - # Guess no on Cygwin. -- cygwin*) gl_cv_func_btowc_nul="guessing no" ;; -+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_nul="guessing yes" ;; - esac -@@ -17024,7 +17024,7 @@ - # special semantics and is distinct from /, please report it to - # . - 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 -@@ -17066,7 +17066,7 @@ - case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; -- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 -+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a - # closed fd may yield -EBADF instead of -1 / errno=EBADF. -@@ -20122,7 +20122,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 ;; -@@ -29433,7 +29433,7 @@ - - case "$host_os" in - mingw*) REPLACE_SETLOCALE=1 ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; - esac -@@ -31292,13 +31292,13 @@ - - case "$host_os" in - # Guess no on Solaris <= 9 and Cygwin. -- solaris2.[1-9] | solaris2.[1-9].* | cygwin*) -+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*) - gl_cv_func_wctob_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_wctob_works="guessing yes" ;; - esac - case "$host_os" in -- cygwin*) -+ cygwin* | msys*) - if test "$cross_compiling" = yes; then : - : - else diff -Naur diffutils-3.3-orig/lib/gnulib.mk diffutils-3.3/lib/gnulib.mk --- diffutils-3.3-orig/lib/gnulib.mk 2013-03-23 14:52:02.000000000 +0000 +++ diffutils-3.3/lib/gnulib.mk 2013-05-08 10:37:14.250000000 +0000