6.2.1

3 files changed, 9 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdc3743399ef..4a6cd454f51f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = mingw-w64-gmp
 	pkgdesc = A free library for arbitrary precision arithmetic (mingw-w64)
-	pkgver = 6.2.0
+	pkgver = 6.2.1
 	pkgrel = 1
 	url = http://gmplib.org
 	arch = any
 	license = LGPL3
 	makedepends = mingw-w64-configure
-	makedepends = wine
 	depends = mingw-w64-crt
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz
-	source = https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz.sig
-	source = exeext.patch
+	source = https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz
+	source = https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz.sig
 	validpgpkeys = 343C2FF0FBEE5EC2EDBEF399F3599FF828C67298
-	sha256sums = 3f33f127bcb6b2c3601676cd3281df45824b148cbf688b73c0fc8248793667d9
-	sha256sums = SKIP
+	sha256sums = 2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41
 	sha256sums = SKIP
 
 pkgname = mingw-w64-gmp
diff --git a/PKGBUILD b/PKGBUILD
index 971d4d7f4c6c..28d05358fe9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,20 @@
 pkgname=mingw-w64-gmp
-pkgver=6.2.0
+pkgver=6.2.1
 pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic (mingw-w64)"
 arch=(any)
 url="http://gmplib.org"
 license=("LGPL3")
 depends=(mingw-w64-crt)
-makedepends=(mingw-w64-configure wine)
+makedepends=(mingw-w64-configure)
 options=(staticlibs !strip !buildflags)
-source=(https://gmplib.org/download/gmp/gmp-$pkgver.tar.lz{,.sig} exeext.patch)
+source=(https://gmplib.org/download/gmp/gmp-$pkgver.tar.lz{,.sig})
 validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298')   # Niels Möller <nisse@lysator.liu.se>
-sha256sums=('3f33f127bcb6b2c3601676cd3281df45824b148cbf688b73c0fc8248793667d9'
-            'SKIP' 'SKIP')
+sha256sums=('2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41'
+            'SKIP')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare () {
-  cd "${srcdir}/gmp-${pkgver}"
-
-  # detect correct exe extension, use it for code generation
-  patch -p1 -i "${srcdir}"/exeext.patch
-  autoreconf -vfi
-}
-
 build() {
   cd "${srcdir}/gmp-${pkgver}"
   for _arch in ${_architectures}; do
diff --git a/exeext.patch b/exeext.patch
deleted file mode 100644
index 584cef8ac93c..000000000000
--- a/exeext.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 0569c68..fed8e16 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -336,7 +336,7 @@ install-data-hook:
- EXTRA_DIST += bootstrap.c
- 
- fac_table.h: gen-fac$(EXEEXT_FOR_BUILD)
--	./gen-fac $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >fac_table.h || (rm -f fac_table.h; exit 1)
-+	./gen-fac$(EXEEXT_FOR_BUILD) $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >fac_table.h || (rm -f fac_table.h; exit 1)
- BUILT_SOURCES += fac_table.h
- 
- gen-fac$(EXEEXT_FOR_BUILD): gen-fac$(U_FOR_BUILD).c bootstrap.c
-@@ -346,11 +346,11 @@ EXTRA_DIST += gen-fac.c
- 
- 
- fib_table.h: gen-fib$(EXEEXT_FOR_BUILD)
--	./gen-fib header $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >fib_table.h || (rm -f fib_table.h; exit 1)
-+	./gen-fib$(EXEEXT_FOR_BUILD) header $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >fib_table.h || (rm -f fib_table.h; exit 1)
- BUILT_SOURCES += fib_table.h
- 
- mpn/fib_table.c: gen-fib$(EXEEXT_FOR_BUILD)
--	./gen-fib table $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/fib_table.c || (rm -f mpn/fib_table.c; exit 1)
-+	./gen-fib$(EXEEXT_FOR_BUILD) table $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/fib_table.c || (rm -f mpn/fib_table.c; exit 1)
- BUILT_SOURCES += mpn/fib_table.c
- 
- gen-fib$(EXEEXT_FOR_BUILD): gen-fib$(U_FOR_BUILD).c bootstrap.c
-@@ -360,11 +360,11 @@ EXTRA_DIST += gen-fib.c
- 
- 
- mp_bases.h: gen-bases$(EXEEXT_FOR_BUILD)
--	./gen-bases header $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mp_bases.h || (rm -f mp_bases.h; exit 1)
-+	./gen-bases$(EXEEXT_FOR_BUILD) header $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mp_bases.h || (rm -f mp_bases.h; exit 1)
- BUILT_SOURCES += mp_bases.h
- 
- mpn/mp_bases.c: gen-bases$(EXEEXT_FOR_BUILD)
--	./gen-bases table $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/mp_bases.c || (rm -f mpn/mp_bases.c; exit 1)
-+	./gen-bases$(EXEEXT_FOR_BUILD) table $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/mp_bases.c || (rm -f mpn/mp_bases.c; exit 1)
- BUILT_SOURCES += mpn/mp_bases.c
- 
- gen-bases$(EXEEXT_FOR_BUILD): gen-bases$(U_FOR_BUILD).c bootstrap.c
-@@ -374,7 +374,7 @@ EXTRA_DIST += gen-bases.c
- 
- 
- trialdivtab.h: gen-trialdivtab$(EXEEXT_FOR_BUILD)
--	./gen-trialdivtab $(GMP_LIMB_BITS) 8000 >trialdivtab.h || (rm -f trialdivtab.h; exit 1)
-+	./gen-trialdivtab$(EXEEXT_FOR_BUILD) $(GMP_LIMB_BITS) 8000 >trialdivtab.h || (rm -f trialdivtab.h; exit 1)
- BUILT_SOURCES += trialdivtab.h
- 
- gen-trialdivtab$(EXEEXT_FOR_BUILD): gen-trialdivtab$(U_FOR_BUILD).c bootstrap.c
-@@ -384,7 +384,7 @@ EXTRA_DIST += gen-trialdivtab.c
- 
- 
- mpn/jacobitab.h: gen-jacobitab$(EXEEXT_FOR_BUILD)
--	./gen-jacobitab >mpn/jacobitab.h || (rm -f mpn/jacobitab.h; exit 1)
-+	./gen-jacobitab$(EXEEXT_FOR_BUILD) >mpn/jacobitab.h || (rm -f mpn/jacobitab.h; exit 1)
- BUILT_SOURCES += mpn/jacobitab.h
- 
- gen-jacobitab$(EXEEXT_FOR_BUILD): gen-jacobitab$(U_FOR_BUILD).c
-@@ -394,7 +394,7 @@ EXTRA_DIST += gen-jacobitab.c
- 
- 
- mpn/perfsqr.h: gen-psqr$(EXEEXT_FOR_BUILD)
--	./gen-psqr $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/perfsqr.h || (rm -f mpn/perfsqr.h; exit 1)
-+	./gen-psqr$(EXEEXT_FOR_BUILD) $(GMP_LIMB_BITS) $(GMP_NAIL_BITS) >mpn/perfsqr.h || (rm -f mpn/perfsqr.h; exit 1)
- BUILT_SOURCES += mpn/perfsqr.h
- 
- gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c bootstrap.c
-diff --git a/acinclude.m4 b/acinclude.m4
-index 3c3ecf5..31be9c8 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -3933,7 +3933,7 @@ EOF
- for i in .exe ,ff8 ""; do
-   gmp_compile="$CC_FOR_BUILD conftest.c -o conftest$i"
-   if AC_TRY_EVAL(gmp_compile); then
--    if (./conftest) 2>&AC_FD_CC; then
-+    if (./conftest$i) 2>&AC_FD_CC; then
-       gmp_cv_prog_exeext_for_build=$i
-       break
-     fi