Sat Mar 7 15:19:20 2020 UTC ()
Match indentation.


(maya)
diff -r1.12 -r1.13 pkgsrc/mk/compiler/gfortran.mk
cvs diff -r1.12 -r1.13 pkgsrc/mk/compiler/gfortran.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gfortran.mk 2020/03/07 15:18:19 1.12
+++ pkgsrc/mk/compiler/gfortran.mk 2020/03/07 15:19:20 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gfortran.mk,v 1.12 2020/03/07 15:18:19 maya Exp $ 1# $NetBSD: gfortran.mk,v 1.13 2020/03/07 15:19:20 maya Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -32,27 +32,27 @@ @@ -32,27 +32,27 @@
32COMPILER_GFORTRAN_MK= defined 32COMPILER_GFORTRAN_MK= defined
33 33
34.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
35 35
36# If pkgsrc base compiler is GCC, match the gfortran requirement as closely as 36# If pkgsrc base compiler is GCC, match the gfortran requirement as closely as
37# possible. Otherwise, default to a mainstream version and hope for the best. 37# possible. Otherwise, default to a mainstream version and hope for the best.
38# If base compiler is clang, we really should use flang rather than gfortran. 38# If base compiler is clang, we really should use flang rather than gfortran.
39POSSIBLE_GFORTRAN_VERSION?= ${CC_VERSION:C/.[0-9].[0-9]//:S/gcc-//} 39POSSIBLE_GFORTRAN_VERSION?= ${CC_VERSION:C/.[0-9].[0-9]//:S/gcc-//}
40 40
41.if (${PKGSRC_COMPILER} == gcc) && \ 41.if (${PKGSRC_COMPILER} == gcc) && \
42 exists(${PKGSRCDIR}/lang/gcc${POSSIBLE_GFORTRAN_VERSION}/buildlink3.mk) 42 exists(${PKGSRCDIR}/lang/gcc${POSSIBLE_GFORTRAN_VERSION}/buildlink3.mk)
43GFORTRAN_VERSION?= ${POSSIBLE_GFORTRAN_VERSION} 43GFORTRAN_VERSION?= ${POSSIBLE_GFORTRAN_VERSION}
44.else 44.else
45GFORTRAN_VERSION?= 7 45GFORTRAN_VERSION?= 7
46.endif 46.endif
47 47
48.if !empty(PKGPATH:Mlang/gcc${GFORTRAN_VERSION}) || !empty(PKGPATH:Mdevel/patch) || \ 48.if !empty(PKGPATH:Mlang/gcc${GFORTRAN_VERSION}) || !empty(PKGPATH:Mdevel/patch) || \
49 !empty(PKGPATH:Mdevel/libtool-base) 49 !empty(PKGPATH:Mdevel/libtool-base)
50IGNORE_GFORTRAN= yes 50IGNORE_GFORTRAN= yes
51MAKEFLAGS+= IGNORE_GFORTRAN=yes 51MAKEFLAGS+= IGNORE_GFORTRAN=yes
52.endif 52.endif
53 53
54.if defined(IGNORE_GFORTRAN) 54.if defined(IGNORE_GFORTRAN)
55_USE_GFORTRAN= NO 55_USE_GFORTRAN= NO
56.endif 56.endif
57 57
58# LANGUAGES.<compiler> is the list of supported languages by the compiler. 58# LANGUAGES.<compiler> is the list of supported languages by the compiler.