This diff works in combination with the libmpc bump

---

Require mpfr and libmpc versions that match the bootstrap.
Adjust GNAT.Socket package to our struct sockaddr layout.

Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile    15 Nov 2016 10:04:58 -0000      1.45
+++ Makefile    15 Nov 2016 16:53:13 -0000
@@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64 arm hppa i386 mip
 DPB_PROPERTIES = parallel
 
 V = 4.9.4
-REVISION = 3
+REVISION = 4
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 
@@ -208,8 +208,8 @@ WANTLIB-ada =               ${WANTLIB} pthread util
 WANTLIB-libs =         m pthread
 
 LIB_DEPENDS +=         devel/gmp>=6.1.1 \
-                       devel/mpfr \
-                       devel/libmpc
+                       devel/mpfr>=3.1.5 \
+                       devel/libmpc>=0.9p2
 LIB_DEPENDS-libs =
 
 .if ${MACHINE_ARCH:Mamd64}
Index: patches/patch-gcc_ada_gsocket_h
===================================================================
RCS file: patches/patch-gcc_ada_gsocket_h
diff -N patches/patch-gcc_ada_gsocket_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-gcc_ada_gsocket_h     15 Nov 2016 16:53:13 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix GNAT.Socket package
+
+--- gcc/ada/gsocket.h.orig     Tue Nov 15 10:22:51 2016
++++ gcc/ada/gsocket.h  Tue Nov 15 10:24:52 2016
+@@ -236,7 +236,8 @@
+ # endif
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__vxworks) || defined(__rtems__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__vxworks) || \
++    defined(__rtems__)
+ # define Has_Sockaddr_Len 1
+ #else
+ # define Has_Sockaddr_Len 0

Reply via email to