CVS commit: pkgsrc

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Thu Sep  3 08:58:42 UTC 2020

Modified Files:
        pkgsrc/devel/gmp: builtin.mk
        pkgsrc/math/mpfr: builtin.mk

Log Message:
gmp,mpfr: Remove CONFIGURE_ARGS flags from builtin.mk as it assumes that
all recursively depending packages can deal with them.
Those packages that need them already add those CONFIGURE_ARGS, at least
pbulk hasn't revealed any issues (thanks jperkin@).
XXX libiconv is in a similar position, so should receive similar
treatment, but at least it only adds the flags if GNU_CONFIGURE=yes
Fixes PR pkg/55487


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/gmp/builtin.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/mpfr/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gmp/builtin.mk
diff -u pkgsrc/devel/gmp/builtin.mk:1.9 pkgsrc/devel/gmp/builtin.mk:1.10
--- pkgsrc/devel/gmp/builtin.mk:1.9     Sun Nov  3 10:39:12 2019
+++ pkgsrc/devel/gmp/builtin.mk Thu Sep  3 08:58:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2019/11/03 10:39:12 rillig Exp $
+# $NetBSD: builtin.mk,v 1.10 2020/09/03 08:58:42 prlw1 Exp $
 
 BUILTIN_PKG:=  gmp
 
@@ -68,9 +68,7 @@ CHECK_BUILTIN.gmp?=   no
 .if !empty(CHECK_BUILTIN.gmp:M[Nn][Oo])
 .  if !empty(USE_BUILTIN.gmp:M[Yy][Ee][Ss])
 GMP_INCLUDE=           ${H_GMP:H}
-CONFIGURE_ARGS+=       --with-gmp-include=${GMP_INCLUDE}
 BUILDLINK_INCDIRS.gmp= ${GMP_INCLUDE}
-CONFIGURE_ARGS+=       --with-gmp-lib=${BUILDLINK_PREFIX.gmp}/lib${LIBABISUFFIX}
 BUILDLINK_LIBDIRS.gmp= lib${LIBABISUFFIX}
 CPPFLAGS+=             -I${GMP_INCLUDE}
 CFLAGS+=               -I${GMP_INCLUDE}

Index: pkgsrc/math/mpfr/builtin.mk
diff -u pkgsrc/math/mpfr/builtin.mk:1.6 pkgsrc/math/mpfr/builtin.mk:1.7
--- pkgsrc/math/mpfr/builtin.mk:1.6     Mon Aug 24 08:20:14 2020
+++ pkgsrc/math/mpfr/builtin.mk Thu Sep  3 08:58:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2020/08/24 08:20:14 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2020/09/03 08:58:42 prlw1 Exp $
 
 BUILTIN_PKG:=  mpfr
 
@@ -66,9 +66,7 @@ CHECK_BUILTIN.mpfr?=  no
 .if !empty(CHECK_BUILTIN.mpfr:M[Nn][Oo])
 .  if !empty(USE_BUILTIN.mpfr:M[Yy][Ee][Ss])
 MPFR_INCLUDE=          ${H_MPFR:H}
-CONFIGURE_ARGS+=       --with-mpfr-include=${MPFR_INCLUDE}
 BUILDLINK_INCDIRS.mpfr=        ${MPFR_INCLUDE}
-CONFIGURE_ARGS+=       --with-mpfr-lib=${BUILDLINK_PREFIX.mpfr}/lib${LIBABISUFFIX}
 BUILDLINK_LIBDIRS.mpfr=        lib${LIBABISUFFIX}
 CPPFLAGS+=             -I${MPFR_INCLUDE}
 CFLAGS+=               -I${MPFR_INCLUDE}