Add option gcc-inplace-math to allow building devel/gmp and math/mpfr

along with gcc, as described at http://gcc.gnu.org/install/prerequisites.html

4 files changed, 32 insertions, 10 deletions

diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 1276f066061..dba1ea08bd1 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2012/04/13 10:35:38 hans Exp $
+# $NetBSD: Makefile,v 1.35 2012/04/13 11:01:32 hans Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc44-${GCC_VERSION}
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
@@ -70,8 +71,6 @@ CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=	--disable-libssp
 CONFIGURE_ARGS+=	--enable-threads=posix
-CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}
-CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
 
@@ -123,6 +122,4 @@ GENERATE_PLIST+=                                                        \
 	cd ${DESTDIR}${PREFIX} && ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print \
 	| ${SORT} ;
 
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../math/mpfr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index ca8e0928ea7..bd7482b7a39 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2012/03/15 07:43:30 sbd Exp $
+$NetBSD: distinfo,v 1.13 2012/04/13 11:01:32 hans Exp $
 
 SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75
 RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a
 Size (gcc-4.4.7.tar.bz2) = 63179340 bytes
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = ea1f9e8b49bd4498812ef8d5f47baf8410794fd3
+SHA1 (patch-ad) = b36357efde53ee3e1a7b18f30b7ae9d9ab837325
 SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621
 SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b
 SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7
diff --git a/lang/gcc44/options.mk b/lang/gcc44/options.mk
index 196f3ed6cea..1d7cf02c370 100644
--- a/lang/gcc44/options.mk
+++ b/lang/gcc44/options.mk
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.10 2012/04/13 10:35:38 hans Exp $
+# $NetBSD: options.mk,v 1.11 2012/04/13 11:01:32 hans Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc44
-PKG_SUPPORTED_OPTIONS=	nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
+PKG_SUPPORTED_OPTIONS=	gcc-inplace-math nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
 PKG_SUGGESTED_OPTIONS=	gcc-c++ gcc-fortran gcc-java gcc-objc
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=	nls
+.elif ${OPSYS} == "SunOS"
+PKG_SUGGESTED_OPTIONS+=	gcc-inplace-math
 .endif
 
 PKG_OPTIONS_LEGACY_VARS+=	BUILD_CXX:gcc-c++
@@ -15,6 +17,19 @@ PKG_OPTIONS_LEGACY_VARS+=	BUILD_OBJC:gcc-objc
 .include "../../mk/bsd.options.mk"
 
 ###
+### Build math libraries in place
+###
+.if !empty(PKG_OPTIONS:Mgcc-inplace-math)
+.include "../../devel/gmp/inplace.mk"
+.include "../../math/mpfr/inplace.mk"
+.else
+CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}
+CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.endif
+
+###
 ### Native Language Support
 ###
 .if !empty(PKG_OPTIONS:Mnls)
diff --git a/lang/gcc44/patches/patch-ad b/lang/gcc44/patches/patch-ad
index 79f4260d095..0e3425143c6 100644
--- a/lang/gcc44/patches/patch-ad
+++ b/lang/gcc44/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
 
 --- configure.orig	2010-10-02 11:40:32.000000000 +0000
 +++ configure
@@ -11,3 +11,13 @@ $NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
    gmpinc="-I$with_mpfr/include"
  fi
  if test "x$with_mpfr_include" != x; then
+@@ -4596,7 +4596,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/${HOST_SUBDIR}/gmp'"$lt_cv_objdir"
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
+