Remove bogus GCC-4.9.3 dependencies.

diff --git a/ChangeLog b/ChangeLog
index b4f684a..bab0b8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-02-21  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Remove bogus GCC-4.9.3 dependencies.
+
+       * mingw32/mingw32-gcc4.xml (gcc-core-dev): Make dependencies on...
+       (libgomp-dll-1, libssp-dll-0): ...these specific to each GCC version.
+       (libgcc-dll-1): Remove unnecessary dependency on...
+       (libmpc-dll-3): ...this; reassign it where it is needed...
+       (gcc-core-bin): ...here.
+
+       * common/issue.log mingw32/issue.log: Update accordingly.
+
 2016-02-20  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Upgrade GCC; make version 4.9.3 the preferred release.

diff --git a/common/issue.log b/common/issue.log
index 29c706e..9deb6d1 100644 (file)
--- a/common/issue.log
+++ b/common/issue.log
@@ -23,6 +23,6 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
-  c6a9068e183254c0b930ac6e1a70fd81743dc212 2016022000 package-list.xml
+  c6a9068e183254c0b930ac6e1a70fd81743dc212 2016022101 package-list.xml
 #
 # $RCSfile$: end of file

diff --git a/mingw32/issue.log b/mingw32/issue.log
index 1262f7e..63912f0 100644 (file)
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -35,7 +35,7 @@
   4dab2d86ca2203a8ac0233824c687504fda4601e 2013091000 mingw32-expat.xml
   bc4b331f9bdfbf72a11a310fbc17a027396d09d5 2012073100 mingw32-gcc-tools.xml
   9d1d9deeccee4fb04f2944e3cd5e7b85757308ce 2011050500 mingw32-gcc3.xml
-  b76fad61980b5e3235ad57a416a13ce8d1516ea6 2016022000 mingw32-gcc4.xml
+  4381a44abfa691a3bda174a06cf84801c88d597a 2016022100 mingw32-gcc4.xml
   21031079d59268339bfd7c6dc8239df214588bca 2013091501 mingw32-gdb.xml
   14dd10ab97b27430bdb688f4e85993cd821f7a05 2012073100 mingw32-gendef.xml
   7b16c690a8b02106e7cc7abc6c6310fe30390683 2015090600 mingw32-gettext.xml
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   8d3a7125499a85916b53efb4c897ac907e2490ab 2015082000 mingw32-mpc.xml
   8a11de23e7a89fd11436bdf162ef90712f30101b 2013102300 mingw32-mpfr.xml
-  56f4032058328cacfabe64fa46706d72c2fa931e 2016022000 mingw32-package-list.xml
+  56f4032058328cacfabe64fa46706d72c2fa931e 2016022100 mingw32-package-list.xml
   1f15439ee5f66ec22321c7aa853559b6f8f7172f 2015090800 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   0a5d210a13d073104fb74b4f9c081674c9745cd1 2013090900 mingw32-pthreads-w32.xml

diff --git a/mingw32/mingw32-gcc4.xml b/mingw32/mingw32-gcc4.xml
index f0f5eb8..032e09f 100644 (file)
--- a/mingw32/mingw32-gcc4.xml
+++ b/mingw32/mingw32-gcc4.xml
@@ -42,8 +42,9 @@
         <requires eq="mingwrt-*-mingw32-dev.tar" />
         <requires eq="w32api-*-mingw32-dev.tar" />
         <release tarname="gcc-core-4.9.3-1-mingw32-bin.tar.xz">
-          <requires eq="libquadmath-%-mingw32-dll-0.tar" />
           <requires eq="libgcc-%-mingw32-dll-1.tar" />
+          <requires eq="libquadmath-%-mingw32-dll-0.tar" />
+          <requires eq="libmpc-*-mingw32-dll-3.tar" />
         </release>
         <release tarname="gcc-core-4.8.1-4-mingw32-bin.tar.lzma">
           <requires eq="gcc-core-%-mingw32-dev.tar" />
@@ -100,17 +101,29 @@
 
       <component class="dev">
         <requires eq="mingw32-libgcc-%-mingw32-dll-1.tar" />
-        <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
-        <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
         <requires eq="mingw32-libquadmath-%-mingw32-dll-0.tar" />
         <release tarname="gcc-4.9.3-1-mingw32-dev.tar.xz">
           <download tarname="none" />
         </release>
-        <release tarname="gcc-core-4.8.1-4-mingw32-dev.tar.lzma" />
-        <release tarname="gcc-core-4.8.1-3-mingw32-dev.tar.lzma" />
-        <release tarname="gcc-core-4.8.1-2-mingw32-dev.tar.lzma" />
-        <release tarname="gcc-core-4.8.1-1-mingw32-dev.tar.lzma" />
+        <release tarname="gcc-core-4.8.1-4-mingw32-dev.tar.lzma">
+          <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
+          <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
+        </release>
+        <release tarname="gcc-core-4.8.1-3-mingw32-dev.tar.lzma">
+          <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
+          <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
+        </release>
+        <release tarname="gcc-core-4.8.1-2-mingw32-dev.tar.lzma">
+          <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
+          <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
+        </release>
+        <release tarname="gcc-core-4.8.1-1-mingw32-dev.tar.lzma">
+          <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
+          <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
+        </release>
         <release tarname="gcc-core-4.7.2-1-mingw32-dev.tar">
+          <requires eq="mingw32-libssp-%-mingw32-dll-0.tar" />
+          <requires eq="mingw32-libgomp-%-mingw32-dll-1.tar" />
           <download tarname="none" />
         </release>
       </component>
@@ -187,9 +200,7 @@
       <licence tarname="gcc-%-mingw32-lic.tar.*" />
 
       <component class="dll">
-        <release tarname="libgcc-4.9.3-1-mingw32-dll-1.tar.xz">
-          <requires eq="mingw32-libmpc-*-mingw32-dll-3.tar" />
-        </release>
+        <release tarname="libgcc-4.9.3-1-mingw32-dll-1.tar.xz" />
         <release tarname="libgcc-4.8.1-4-mingw32-dll-1.tar">
           <download tarname="gcc-core-4.8.1-4-mingw32-dll.tar.lzma"/>
           <requires eq="mingw32-libmpc-*-mingw32-dll-3.tar" />
@@ -814,3 +825,4 @@
   </package-collection>
 </software-distribution>
 <!-- vim: set nocompatible expandtab fileformat=unix textwidth=80 tabstop=2 shiftwidth=2: -->
+