[src/trunk]: src/external/lgpl3/gmp/lib/libgmp If MACHINE_ARCH contains armv[...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7728257a23dd
branches:  trunk
changeset: 789032:7728257a23dd
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 04 23:37:54 2013 +0000

description:
If MACHINE_ARCH contains armv[467], use arm instead.

diffstat:

 external/lgpl3/gmp/lib/libgmp/Makefile |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 924eace36405 -r 7728257a23dd external/lgpl3/gmp/lib/libgmp/Makefile
--- a/external/lgpl3/gmp/lib/libgmp/Makefile    Sun Aug 04 22:19:42 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/Makefile    Sun Aug 04 23:37:54 2013 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.14 2012/11/26 18:57:33 drochner Exp $
+#      $NetBSD: Makefile,v 1.15 2013/08/04 23:37:54 matt Exp $
 
 .include <bsd.init.mk>
 
 # We don't install gmp, just provide it for GCC.
 LIBISPRIVATE?= yes
 
+LIBGMP_MACHINE_ARCH?=  ${MACHINE_ARCH:C/armv[467]/arm/}
+
 .if ${LIBISPRIVATE} != "yes"
 INCS=         gmp.h
 INCSDIR=      /usr/include
@@ -145,7 +147,7 @@
 
 .endfor
 
-CPPFLAGS+=     -I. -I${DIST} -I${.CURDIR}/arch/${MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
+CPPFLAGS+=     -I. -I${DIST} -I${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
 
 WITHOUT_MAN=   yes
 
@@ -179,13 +181,14 @@
 
 CLEANFILES+=   ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr gen-trialdivtab
 
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+
+.include "${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/Makefile.inc"
 
 # XXX stuff looks for "../config.m4"
 dummy:
        mkdir dummy
-${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
-       cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
+${.OBJDIR}/config.m4: ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/config.m4
+       cp ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
 
 CLEANFILES+=   config.m4
 clean: cleandummy
@@ -218,7 +221,7 @@
 
 .PATH: ${DIST} \
        ${DIST}/mpn/generic \
-       ${.CURDIR}/arch/${MACHINE_ARCH} \
+       ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} \
        ${DIST}/mpf \
        ${DIST}/mpz