summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2018-09-18 01:04:24 +0300
committerAlon Bar-Lev <alonbl@gentoo.org>2018-09-18 01:05:12 +0300
commit83c83c10f1863ed7fd3b350e24ede3224175ed2a (patch)
tree3f6b9d96f97529c1d4d86bd41e8927a287f00fec /dev-util/mingw64-runtime/files
parentdev-util/mingw64-runtime: verison bump (diff)
downloadgentoo-83c83c10f1863ed7fd3b350e24ede3224175ed2a.tar.gz
gentoo-83c83c10f1863ed7fd3b350e24ede3224175ed2a.tar.bz2
gentoo-83c83c10f1863ed7fd3b350e24ede3224175ed2a.zip
dev-util/mingw64-runtime: cleanup old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-util/mingw64-runtime/files')
-rw-r--r--dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch88
-rw-r--r--dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch86
-rw-r--r--dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch41
-rw-r--r--dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch36
-rw-r--r--dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch37
5 files changed, 0 insertions, 288 deletions
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
deleted file mode 100644
index 6461b98e5044..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 67434f57cbb5aba791e9ca973a86859e0736f829 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 21:31:10 +0300
-Subject: [PATCH 2/2] build: autoconf: enable multiple tools and libs
-
-this somewhat reduces the error checking, but makes code and usage nicer.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 55 ++++++++++++-------------------------------------------
- 1 file changed, 12 insertions(+), 43 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b1..1b59821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,32 +56,12 @@ AC_ARG_WITH([libraries],
- [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
- [],
- [with_libraries=no])
--AS_CASE([$with_libraries],
-- [yes|all],[
-- with_libraries="libmangle,pseh,winpthreads"
-- with_libraries_winpthreads=yes
-- with_libraries_mangle=yes
-- with_libraries_pseh=yes],
-- [libmangle],[
-- with_libraries="libmangle"
-- with_libraries_winpthreads=no
-- with_libraries_mangle=yes
-- with_libraries_pseh=no],
-- [pseh],[
-- with_libraries="pseh"
-- with_libraries_winpthreads=no
-- with_libraries_mangle=no
-- with_libraries_pseh=yes],
-- [winpthreads],[
-- with_libraries="winpthreads"
-- with_libraries_winpthreads=yes
-- with_libraries_mangle=no
-- with_libraries_pseh=no],
-- [no],[
-- with_libraries_winpthreads=no
-- with_libraries_mangle=no
-- with_libraries_pseh=no],
-- [MW64_OPTION_ERROR([with-libraries])])
-+for l in winpthreads mangle pseh; do
-+ res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
-+ AS_CASE([$with_libraries],
-+ [all|yes],[res=yes])
-+ AS_VAR_COPY([with_libraries_$l], [res])
-+done
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
- AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
-@@ -96,23 +76,12 @@ AC_ARG_WITH([tools],
- [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
- [],
- [with_tools=no])
--AS_CASE([$with_tools],
-- [yes|all],[
-- with_tools="gendef,genidl"
-- with_tools_gendef=yes
-- with_tools_genidl=yes],
-- [gendef],[
-- with_tools="gendef"
-- with_tools_gendef=yes
-- with_tools_genidl=no],
-- [genidl],[
-- with_tools="genidl"
-- with_tools_gendef=no
-- with_tools_genidl=yes],
-- [no],[
-- with_tools_gendef=no
-- with_tools_genidl=no],
-- [MW64_OPTION_ERROR([with-tools])])
-+for t in gendef genidl; do
-+ res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
-+ AS_CASE([$with_tools],
-+ [all|yes],[res=yes])
-+ AS_VAR_COPY([with_tools_$t], [res])
-+done
- AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
- AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
- AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
---
-2.3.6
-
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
deleted file mode 100644
index 0d3e59dc9dd5..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0adec5d0e1c65fc4ce4f84f3d4bb6738e923e1de Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 20:39:52 +0300
-Subject: [PATCH 1/2] build: autoconf: support winpthreads library
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile.am | 6 +++++-
- configure.ac | 15 +++++++++++++--
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 26a7606..308b6fd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,6 +14,10 @@ if LIBRARIES_PSEH
- MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
- endif
-
-+if LIBRARIES_WINPTHREADS
-+ MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
-+endif
-+
- if TOOLS_GENDEF
- MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
- endif
-@@ -22,7 +26,7 @@ if TOOLS_GENIDL
- MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
- endif
-
--SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
-+SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
-
- DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
-
-diff --git a/configure.ac b/configure.ac
-index 4bb3926..468d1b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
- AC_MSG_CHECKING([whether to build the optional libraries])
- AC_ARG_WITH([libraries],
- [AS_HELP_STRING([--with-libraries=ARG],
-- [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])],
-+ [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
- [],
- [with_libraries=no])
- AS_CASE([$with_libraries],
- [yes|all],[
-- with_libraries="libmangle,pseh"
-+ with_libraries="libmangle,pseh,winpthreads"
-+ with_libraries_winpthreads=yes
- with_libraries_mangle=yes
- with_libraries_pseh=yes],
- [libmangle],[
- with_libraries="libmangle"
-+ with_libraries_winpthreads=no
- with_libraries_mangle=yes
- with_libraries_pseh=no],
- [pseh],[
- with_libraries="pseh"
-+ with_libraries_winpthreads=no
- with_libraries_mangle=no
- with_libraries_pseh=yes],
-+ [winpthreads],[
-+ with_libraries="winpthreads"
-+ with_libraries_winpthreads=yes
-+ with_libraries_mangle=no
-+ with_libraries_pseh=no],
- [no],[
-+ with_libraries_winpthreads=no
- with_libraries_mangle=no
- with_libraries_pseh=no],
- [MW64_OPTION_ERROR([with-libraries])])
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
-+AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
- AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
- AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
-+AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
- AC_MSG_RESULT([$with_libraries])
-
- AC_MSG_CHECKING([whether to build the optional tools])
---
-2.3.6
-
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
deleted file mode 100644
index 859e00243d33..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..cefdd8cb 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -1031,13 +1031,16 @@ redo_switch:
- PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
- *aCode=c_ill; return 0;
-- case c_4: sz++;
-- case c_3: sz++;
-- case c_lb:
-- case c_2: sz++;
-- case c_retn: case c_retf:
-- case c_iret: case c_int3:
-- case c_ad: case c_op:
-+ case c_4: sz++; // fallthrough
-+ case c_3: sz++; // fallthrough
-+ case c_lb: // fallthrough
-+ case c_2: sz++; // fallthrough
-+ case c_retn: // fallthrough
-+ case c_retf: // fallthrough
-+ case c_iret: // fallthrough
-+ case c_int3: // fallthrough
-+ case c_ad: // fallthrough
-+ case c_op: // fallthrough
- case c_1: *aCode=tb1; return sz;
- case c_lv:
- if (oper_mode) sz+=4;
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..6a37b1a0 100644
---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
-+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -203,7 +203,7 @@ pass_args (int argc, char **argv)
- goto error_point;
- case 'h':
- if (h[2] == 0)
-- show_usage ();
-+ show_usage (); // fallthrough
- default:
- error_point:
- fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
deleted file mode 100644
index a7a0a09dc162..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/mingw-w64-crt/lib32/msvcrt.def.in
-+++ b/mingw-w64-crt/lib32/msvcrt.def.in
-@@ -138,6 +138,7 @@ _copysign
- _cprintf
- _cputs
- _creat
-+_create_locale
- _cscanf
- _ctype DATA
- _cwait
-@@ -192,6 +193,7 @@ _fpieee_flt
- _fpreset DATA
- _fputchar
- _fputwchar
-+_free_locale
- _fsopen
- _fstat
- _fstat32 == _fstat
---- a/mingw-w64-crt/lib64/msvcrt.def.in
-+++ b/mingw-w64-crt/lib64/msvcrt.def.in
-@@ -240,6 +240,7 @@ _cprintf_p_l
- _cputs
- _cputws
- _creat
-+_create_locale
- _cscanf
- _cscanf_l
- _cscanf_s
-@@ -315,6 +316,7 @@ _fputchar
- _fputwchar
- _fscanf_l
- _fscanf_s_l
-+_free_locale
- _fsopen
- _fstat
- _fstat64
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
deleted file mode 100644
index 624a492338e3..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb860ab6fba86f646bcd3bff6cadcc2bdd3c6964 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Nov 2017 21:58:10 +0200
-Subject: [PATCH] build: enable pseh only in x86
-
-pseh supports only x86, no point in enabling it when libraries are
-enabled. This enables downstream to enable libraries without failing.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b19..cfb07362 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,10 +58,14 @@ AC_ARG_WITH([libraries],
- [with_libraries=no])
- AS_CASE([$with_libraries],
- [yes|all],[
-- with_libraries="libmangle,pseh,winpthreads"
-+ with_libraries="libmangle,winpthreads"
- with_libraries_winpthreads=yes
- with_libraries_mangle=yes
-- with_libraries_pseh=yes],
-+ AS_CASE([$host_cpu],
-+ [i?86], [
-+ with_libraries="$with_libraries,pseh"
-+ with_libraries_pseh=yes
-+ ])],
- [libmangle],[
- with_libraries="libmangle"
- with_libraries_winpthreads=no
---
-2.13.6
-