Date: Wednesday, June 4, 2014 @ 13:48:10
Author: spupykin
Revision: 112596
upgpkg: mingw-w64-crt 3.1.0-3
upd
Added:
mingw-w64-crt/trunk/0004-secapi-wrapper.patch
mingw-w64-crt/trunk/0005-regenerate-automake.patch
Modified:
mingw-w64-crt/trunk/PKGBUILD
--------------------------------+
0004-secapi-wrapper.patch | 111 ++++++++++++++++++++++++
0005-regenerate-automake.patch | 180 +++++++++++++++++++++++++++++++++++++++
PKGBUILD | 15 ++-
3 files changed, 303 insertions(+), 3 deletions(-)
Added: 0004-secapi-wrapper.patch
===================================================================
--- 0004-secapi-wrapper.patch (rev 0)
+++ 0004-secapi-wrapper.patch 2014-06-04 11:48:10 UTC (rev 112596)
@@ -0,0 +1,111 @@
+commit 81caa6f48281a0bd9376d561fb688994f771e3c3
+Author: Jonathan Yong <10wa...@gmail.com>
+Date: Mon May 26 06:55:32 2014 +0800
+
+ Add secapi wrapper for strerror_s
+
+ git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@6559
4407c894-4637-0410-b4f5-ada5f102cad1
+ (cherry picked from commit d710b9af4038a2c2ff7871cd6181a24a6d5c7e37)
+
+ Conflicts:
+
+ mingw-w64-crt/Makefile.am
+ mingw-w64-crt/Makefile.in
+
+diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
+--- a/mingw-w64-crt/Makefile.am
++++ b/mingw-w64-crt/Makefile.am
+@@ -150,6 +150,7 @@
+ secapi/asctime_s.c \
+ secapi/memcpy_s.c \
+ secapi/rand_s.c \
++ secapi/strerror_s.c \
+ secapi/sprintf_s.c \
+ secapi/vsprintf_s.c \
+ secapi/wmemcpy_s.c
+diff --git a/mingw-w64-crt/lib32/msvcrt.def.in
b/mingw-w64-crt/lib32/msvcrt.def.in
+index 6c2c3cf..cf55dd7 100644
+--- a/mingw-w64-crt/lib32/msvcrt.def.in
++++ b/mingw-w64-crt/lib32/msvcrt.def.in
+@@ -1202,7 +1202,7 @@ sprintf_s
+ sscanf_s
+ strcat_s
+ strcpy_s
+-strerror_s
++; strerror_s replaced by emu
+ strncat_s
+ strncpy_s
+ ; strnlen replaced by emu
+diff --git a/mingw-w64-crt/lib64/msvcrt.def.in
b/mingw-w64-crt/lib64/msvcrt.def.in
+index ed81eff..efadb80 100644
+--- a/mingw-w64-crt/lib64/msvcrt.def.in
++++ b/mingw-w64-crt/lib64/msvcrt.def.in
+@@ -1190,7 +1190,7 @@ strcpy
+ strcpy_s
+ strcspn
+ strerror
+-strerror_s
++; strerror_s replaced by emu
+ strftime
+ strlen
+ strncat
+diff --git a/mingw-w64-crt/secapi/strerror_s.c
b/mingw-w64-crt/secapi/strerror_s.c
+new file mode 100644
+index 0000000..714ad9b
+--- /dev/null
++++ b/mingw-w64-crt/secapi/strerror_s.c
+@@ -0,0 +1,54 @@
++#include <windows.h>
++#include <malloc.h>
++#include <errno.h>
++#include <msvcrt.h>
++
++char * __cdecl strerror (int);
++errno_t __cdecl strerror_s (char *, size_t, int);
++int __cdecl sprintf_s (char *, size_t, const char *, ...);
++static errno_t __cdecl _int_strerror_s (char *, size_t, int);
++static errno_t __cdecl _stub (char *, size_t, int);
++
++errno_t __cdecl (*__MINGW_IMP_SYMBOL(strerror_s))(char *, size_t, int) =
_stub;
++
++static errno_t __cdecl
++_stub (char *buffer, size_t numberOfElements, int errnum)
++{
++ errno_t __cdecl (*f)(char *, size_t, int) = __MINGW_IMP_SYMBOL(strerror_s);
++
++ if (f == _stub)
++ {
++ f = (errno_t __cdecl (*)(char *, size_t, int))
++ GetProcAddress (__mingw_get_msvcrt_handle (), "strerror_s");
++ if (!f)
++ f = _int_strerror_s;
++ __MINGW_IMP_SYMBOL(strerror_s) = f;
++ }
++ return (*f)(buffer, numberOfElements, errnum);
++}
++
++errno_t __cdecl
++strerror_s (char *buffer, size_t numberOfElements, int errnum)
++{
++ return _stub (buffer, numberOfElements, errnum);
++}
++
++static errno_t __cdecl
++_int_strerror_s (char *buffer, size_t numberOfElements, int errnum)
++{
++ char *errmsg = strerror(errnum);
++
++ if (!errmsg || !buffer || numberOfElements == 0)
++ {
++ errno = EINVAL;
++ return EINVAL;
++ }
++
++ if (sprintf_s(buffer, numberOfElements, "%s", errmsg) == -1)
++ {
++ errno = EINVAL;
++ return EINVAL;
++ }
++
++ return 0;
++}
Added: 0005-regenerate-automake.patch
===================================================================
--- 0005-regenerate-automake.patch (rev 0)
+++ 0005-regenerate-automake.patch 2014-06-04 11:48:10 UTC (rev 112596)
@@ -0,0 +1,180 @@
+commit b86c5335d9ef3381283fe60d18e6b18b594d5d41
+Author: Jonathan Yong <10wa...@gmail.com>
+Date: Mon May 26 06:59:21 2014 +0800
+
+ Regenerate automake
+
+ Regenerate changes from last commit
+
+diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
+index 14e2777..4c7c2df 100644
+--- a/mingw-w64-crt/Makefile.in
++++ b/mingw-w64-crt/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.14 from Makefile.am.
++# Makefile.in generated by automake 1.14.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994-2013 Free Software Foundation, Inc.
+@@ -1081,8 +1081,8 @@ am__lib32_libmsvcrt_a_SOURCES_DIST =
misc/invalid_parameter_handler.c \
+ secapi/_waccess_s.c secapi/_wasctime_s.c secapi/_wctime32_s.c \
+ secapi/_wctime64_s.c secapi/_wstrtime_s.c secapi/_wmktemp_s.c \
+ secapi/_wstrdate_s.c secapi/asctime_s.c secapi/memcpy_s.c \
+- secapi/rand_s.c secapi/vsprintf_s.c secapi/wmemcpy_s.c \
+- misc/lc_locale_func.c lib32/msvcrt.def.in
++ secapi/rand_s.c secapi/strerror_s.c secapi/vsprintf_s.c \
++ secapi/wmemcpy_s.c misc/lc_locale_func.c lib32/msvcrt.def.in
+ am__objects_19 = \
+ misc/lib32_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
+ misc/lib32_libmsvcrt_a-output_format.$(OBJEXT) \
+@@ -1118,6 +1118,7 @@ am__objects_19 = \
+ secapi/lib32_libmsvcrt_a-asctime_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-rand_s.$(OBJEXT) \
++ secapi/lib32_libmsvcrt_a-strerror_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-vsprintf_s.$(OBJEXT) \
+ secapi/lib32_libmsvcrt_a-wmemcpy_s.$(OBJEXT)
+ am__objects_20 = $(am__objects_19) \
+@@ -2181,8 +2182,8 @@ am__lib64_libmsvcrt_a_SOURCES_DIST =
misc/invalid_parameter_handler.c \
+ secapi/_waccess_s.c secapi/_wasctime_s.c secapi/_wctime32_s.c \
+ secapi/_wctime64_s.c secapi/_wstrtime_s.c secapi/_wmktemp_s.c \
+ secapi/_wstrdate_s.c secapi/asctime_s.c secapi/memcpy_s.c \
+- secapi/rand_s.c secapi/vsprintf_s.c secapi/wmemcpy_s.c \
+- lib64/msvcrt.def.in
++ secapi/rand_s.c secapi/strerror_s.c secapi/vsprintf_s.c \
++ secapi/wmemcpy_s.c lib64/msvcrt.def.in
+ am__objects_50 = \
+ misc/lib64_libmsvcrt_a-invalid_parameter_handler.$(OBJEXT) \
+ misc/lib64_libmsvcrt_a-output_format.$(OBJEXT) \
+@@ -2218,6 +2219,7 @@ am__objects_50 = \
+ secapi/lib64_libmsvcrt_a-asctime_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-memcpy_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-rand_s.$(OBJEXT) \
++ secapi/lib64_libmsvcrt_a-strerror_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-vsprintf_s.$(OBJEXT) \
+ secapi/lib64_libmsvcrt_a-wmemcpy_s.$(OBJEXT)
+ @LIB64_TRUE@@W32API_FALSE@am_lib64_libmsvcrt_a_OBJECTS = \
+@@ -3820,6 +3822,7 @@ src_msvcrt = \
+ secapi/asctime_s.c \
+ secapi/memcpy_s.c \
+ secapi/rand_s.c \
++ secapi/strerror_s.c \
+ secapi/vsprintf_s.c \
+ secapi/wmemcpy_s.c
+
+@@ -6738,6 +6741,8 @@ secapi/lib32_libmsvcrt_a-memcpy_s.$(OBJEXT):
secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib32_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
++secapi/lib32_libmsvcrt_a-strerror_s.$(OBJEXT): secapi/$(am__dirstamp) \
++ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib32_libmsvcrt_a-vsprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib32_libmsvcrt_a-wmemcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
+@@ -8310,6 +8315,8 @@ secapi/lib64_libmsvcrt_a-memcpy_s.$(OBJEXT):
secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib64_libmsvcrt_a-rand_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
++secapi/lib64_libmsvcrt_a-strerror_s.$(OBJEXT): secapi/$(am__dirstamp) \
++ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib64_libmsvcrt_a-vsprintf_s.$(OBJEXT): secapi/$(am__dirstamp) \
+ secapi/$(DEPDIR)/$(am__dirstamp)
+ secapi/lib64_libmsvcrt_a-wmemcpy_s.$(OBJEXT): secapi/$(am__dirstamp) \
+@@ -10662,6 +10669,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-asctime_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-memcpy_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-rand_s.Po@am__quote@
++@AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib32_libmsvcrt_a-wmemcpy_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-_access_s.Po@am__quote@
+@@ -10696,6 +10704,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-asctime_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-memcpy_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-rand_s.Po@am__quote@
++@AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@secapi/$(DEPDIR)/lib64_libmsvcrt_a-wmemcpy_s.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@stdio/$(DEPDIR)/lib32_libmingwex_a-_Exit.Po@am__quote@
+@@ -19842,6 +19851,20 @@ secapi/lib32_libmsvcrt_a-rand_s.obj: secapi/rand_s.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o secapi/lib32_libmsvcrt_a-rand_s.obj `if test -f 'secapi/rand_s.c'; then
$(CYGPATH_W) 'secapi/rand_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/rand_s.c';
fi`
+
++secapi/lib32_libmsvcrt_a-strerror_s.o: secapi/strerror_s.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
secapi/lib32_libmsvcrt_a-strerror_s.o -MD -MP -MF
secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo -c -o
secapi/lib32_libmsvcrt_a-strerror_s.o `test -f 'secapi/strerror_s.c' || echo
'$(srcdir)/'`secapi/strerror_s.c
++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo
secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c'
object='secapi/lib32_libmsvcrt_a-strerror_s.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o secapi/lib32_libmsvcrt_a-strerror_s.o `test -f 'secapi/strerror_s.c' || echo
'$(srcdir)/'`secapi/strerror_s.c
++
++secapi/lib32_libmsvcrt_a-strerror_s.obj: secapi/strerror_s.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
secapi/lib32_libmsvcrt_a-strerror_s.obj -MD -MP -MF
secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo -c -o
secapi/lib32_libmsvcrt_a-strerror_s.obj `if test -f 'secapi/strerror_s.c'; then
$(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W)
'$(srcdir)/secapi/strerror_s.c'; fi`
++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Tpo
secapi/$(DEPDIR)/lib32_libmsvcrt_a-strerror_s.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c'
object='secapi/lib32_libmsvcrt_a-strerror_s.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o secapi/lib32_libmsvcrt_a-strerror_s.obj `if test -f 'secapi/strerror_s.c';
then $(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W)
'$(srcdir)/secapi/strerror_s.c'; fi`
++
+ secapi/lib32_libmsvcrt_a-vsprintf_s.o: secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lib32_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
secapi/lib32_libmsvcrt_a-vsprintf_s.o -MD -MP -MF
secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Tpo -c -o
secapi/lib32_libmsvcrt_a-vsprintf_s.o `test -f 'secapi/vsprintf_s.c' || echo
'$(srcdir)/'`secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Tpo
secapi/$(DEPDIR)/lib32_libmsvcrt_a-vsprintf_s.Po
+@@ -28746,6 +28769,20 @@ secapi/lib64_libmsvcrt_a-rand_s.obj: secapi/rand_s.c
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o secapi/lib64_libmsvcrt_a-rand_s.obj `if test -f 'secapi/rand_s.c'; then
$(CYGPATH_W) 'secapi/rand_s.c'; else $(CYGPATH_W) '$(srcdir)/secapi/rand_s.c';
fi`
+
++secapi/lib64_libmsvcrt_a-strerror_s.o: secapi/strerror_s.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
secapi/lib64_libmsvcrt_a-strerror_s.o -MD -MP -MF
secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo -c -o
secapi/lib64_libmsvcrt_a-strerror_s.o `test -f 'secapi/strerror_s.c' || echo
'$(srcdir)/'`secapi/strerror_s.c
++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo
secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c'
object='secapi/lib64_libmsvcrt_a-strerror_s.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o secapi/lib64_libmsvcrt_a-strerror_s.o `test -f 'secapi/strerror_s.c' || echo
'$(srcdir)/'`secapi/strerror_s.c
++
++secapi/lib64_libmsvcrt_a-strerror_s.obj: secapi/strerror_s.c
++@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
secapi/lib64_libmsvcrt_a-strerror_s.obj -MD -MP -MF
secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo -c -o
secapi/lib64_libmsvcrt_a-strerror_s.obj `if test -f 'secapi/strerror_s.c'; then
$(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W)
'$(srcdir)/secapi/strerror_s.c'; fi`
++@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Tpo
secapi/$(DEPDIR)/lib64_libmsvcrt_a-strerror_s.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='secapi/strerror_s.c'
object='secapi/lib64_libmsvcrt_a-strerror_s.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c
-o secapi/lib64_libmsvcrt_a-strerror_s.obj `if test -f 'secapi/strerror_s.c';
then $(CYGPATH_W) 'secapi/strerror_s.c'; else $(CYGPATH_W)
'$(srcdir)/secapi/strerror_s.c'; fi`
++
+ secapi/lib64_libmsvcrt_a-vsprintf_s.o: secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(lib64_libmsvcrt_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
secapi/lib64_libmsvcrt_a-vsprintf_s.o -MD -MP -MF
secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Tpo -c -o
secapi/lib64_libmsvcrt_a-vsprintf_s.o `test -f 'secapi/vsprintf_s.c' || echo
'$(srcdir)/'`secapi/vsprintf_s.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Tpo
secapi/$(DEPDIR)/lib64_libmsvcrt_a-vsprintf_s.Po
+@@ -33490,9 +33527,10 @@ distcheck: dist
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++ && ../configure \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
++ --srcdir=.. --prefix="$$dc_install_base" \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+diff --git a/mingw-w64-crt/aclocal.m4 b/mingw-w64-crt/aclocal.m4
+index ad01e78..e50a8eb 100644
+--- a/mingw-w64-crt/aclocal.m4
++++ b/mingw-w64-crt/aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.14 -*- Autoconf -*-
++# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.14'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.14], [],
++m4_if([$1], [1.14.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.14])dnl
++[AM_AUTOMAKE_VERSION([1.14.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-04 11:25:54 UTC (rev 112595)
+++ PKGBUILD 2014-06-04 11:48:10 UTC (rev 112596)
@@ -6,7 +6,7 @@
pkgname=mingw-w64-crt
pkgver=3.1.0
-pkgrel=2
+pkgrel=3
pkgdesc='MinGW-w64 CRT for Windows'
arch=('any')
url='http://mingw-w64.sourceforge.net'
@@ -17,11 +17,15 @@
source=(http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2
0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
0001-Add-secapi-wrapper-for-sprintf_s.patch
- 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch)
+ 0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch
+ 0004-secapi-wrapper.patch
+ 0005-regenerate-automake.patch)
md5sums=('df0e7657f46cbd59ed9cbe2a50c66e15'
'a6df990508d09dae874778a7863a796d'
'b116e994bfce8e3fc54e71219d5ad409'
- '0a91be4a5ee7154c6faa35e5078f29cf')
+ '0a91be4a5ee7154c6faa35e5078f29cf'
+ '093d252061d90f7a2a9f5252e74e5d06'
+ '2e1c1b73e5291b6f453d205259282b04')
prepare() {
cd ${srcdir}/mingw-w64-v${pkgver}
@@ -28,6 +32,11 @@
patch -p1 < ${srcdir}/0001-Add-secapi-wrapper-for-sprintf_s.patch
patch -p1 <
${srcdir}/0001-Add-_gmtime32-and-_localtime32-to-lib64-msvcrt.def.patch
patch -p1 <
${srcdir}/0002-Remove-rand_s-and-vsprintf_s-from-msvcrt.def.in.patch
+ patch -p1 < ${srcdir}/0004-secapi-wrapper.patch
+# patch -p1 < ${srcdir}/0005-regenerate-automake.patch
+ cd mingw-w64-crt
+ aclocal
+ automake
}
build() {
