Fix libmingwex-n.dll dependencies; cf. Issue #40438.

diff --git a/ChangeLog b/ChangeLog
index 229de1f..8354c73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-27  Keith Marshall  <keith@users.osdn.me>
+
+       Fix libmingwex-n.dll dependencies; cf. Issue #40438.
+
+       * VERSION.m4 (LIBMINGWEX): Increment interface version to 3:0:0.
+
 2020-05-26  Keith Marshall  <keith@users.osdn.me>
 
        Adjust repository version following WSL-5.3.1 release.

diff --git a/VERSION.m4 b/VERSION.m4
index cec4224..d172ad5 100644 (file)
--- a/VERSION.m4
+++ b/VERSION.m4
@@ -23,7 +23,7 @@ m4_define([__VERSION__],[5.3.2])
 #    as required, in accordance with libtool conventions.
 #
 m4_define([MINGW_AC_ENUMERATE_DLLVERSION_SPECS],dnl
-[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [2:0:0])dnl
+[MINGW_AC_SET_DLLVERSION([LIBMINGWEX], [libmingwex.dll.a], [3:0:0])dnl
 ])
 
 # $RCSfile$: end of file

diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog
index ac5f7ba..130b3f4 100644 (file)
--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-27  Keith Marshall  <keith@users.osdn.me>
+
+       Fix libmingwex-n.dll dependencies; cf. Issue #40438.
+
+       * Makefile.in (libmingwex.a): Remove...
+       (mbrscan.$OBJEEXT, wcharmap.$OBJEXT): ...these; relocate them to...
+       (libmingw32.a): ...here.
+
 2020-04-30  Keith Marshall  <keith@users.osdn.me>
 
        Prepare and publish MinGW.org WSL-5.3.1 release.

diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in
index 654c31f..01bc0e3 100644 (file)
--- a/mingwrt/Makefile.in
+++ b/mingwrt/Makefile.in
@@ -468,8 +468,9 @@ libmingwex.a: $(addsuffix .$(OBJEXT), mkstemp mkdtemp cryptnam setenv)
 
 vpath %.s ${mingwrt_srcdir}/mingwex
 vpath %.sx ${mingwrt_srcdir}/mingwex
-libmingwex.a: $(addsuffix .$(OBJEXT), codeset mbrconv mbrscan mbrlen)
-libmingwex.a: $(addsuffix .$(OBJEXT), mbrtowc mbsrtowcs strnlen wcharmap)
+libmingw32.a: $(addsuffix .$(OBJEXT), mbrscan wcharmap)
+libmingwex.a: $(addsuffix .$(OBJEXT), codeset mbrconv mbrlen)
+libmingwex.a: $(addsuffix .$(OBJEXT), mbrtowc mbsrtowcs strnlen)
 libmingwex.a: $(addsuffix .$(OBJEXT), wcrtomb wcsrtombs wcsnlen wcstod wcstof)
 libmingwex.a: $(addsuffix .$(OBJEXT), wcstofp wcstold wctob wctrans wctype)
 libmingwex.a: $(addsuffix .$(OBJEXT), wmemchr wmemcmp wmemcpy wmemmove wmemset)