CVS commit: pkgsrc/mk/compiler

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Mar  5 10:40:18 UTC 2017

Modified Files:
        pkgsrc/mk/compiler: f2c.mk

Log Message:
Fix path to cross-libtool-base in f2c.mk for crossbuilding


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mk/compiler/f2c.mk

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

Modified files:

Index: pkgsrc/mk/compiler/f2c.mk
diff -u pkgsrc/mk/compiler/f2c.mk:1.17 pkgsrc/mk/compiler/f2c.mk:1.18
--- pkgsrc/mk/compiler/f2c.mk:1.17      Wed Nov 25 13:05:47 2015
+++ pkgsrc/mk/compiler/f2c.mk   Sun Mar  5 10:40:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.17 2015/11/25 13:05:47 jperkin Exp $
+# $NetBSD: f2c.mk,v 1.18 2017/03/05 10:40:18 kamil Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -87,7 +87,7 @@ PREPEND_PATH+=        ${_F2C_DIR}/bin
 # Dependencies:
 TOOL_DEPENDS+= f2c>=20090411nb2:../../lang/f2c # translator
 
-.if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mcross/libtool-base) # See below
+.if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mcross/cross-libtool-base) # See below
 .  include "../../devel/libf2c/buildlink3.mk" # library
 .endif
 
@@ -96,7 +96,7 @@ PKGSRC_MAKE_ENV+=     F2C_DIR=${F2C_DIR:Q}
 .  endif
 
 # libtool-base is special as it only needs f77 to extract linker flags etc.
-.if !empty(PKGPATH:Mdevel/libtool-base) || !empty(PKGPATH:Mcross/libtool-base)
+.if !empty(PKGPATH:Mdevel/libtool-base) || !empty(PKGPATH:Mcross/cross-libtool-base)
 pre-configure: fake-f2c-libs
 
 _WRAP_EXTRA_ARGS.FC+=  -L${WRKDIR}/.f2c/lib -I${WRKDIR}/.f2c/include