Sat Jun 3 14:26:36 2023 UTC ()
bsd.pkg.use.mk: TOOL_DEPENDS, not BUILD_DEPENDS, for libtool-fortran.

But we need a cross-libtool-fortran for this to actually work in
cross compilation.

No functional change intended for native compilation, since
BUILD_DEPENDS and TOOL_DEPENDS have the same semantics there.


(riastradh)
diff -r1.72 -r1.73 pkgsrc/mk/bsd.pkg.use.mk
cvs diff -r1.72 -r1.73 pkgsrc/mk/bsd.pkg.use.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.use.mk 2022/06/07 10:04:25 1.72
+++ pkgsrc/mk/bsd.pkg.use.mk 2023/06/03 14:26:36 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.use.mk,v 1.72 2022/06/07 10:04:25 jperkin Exp $ 1# $NetBSD: bsd.pkg.use.mk,v 1.73 2023/06/03 14:26:36 riastradh Exp $
2# 2#
3# Turn USE_* macros into proper depedency logic. Included near the top of 3# Turn USE_* macros into proper depedency logic. Included near the top of
4# bsd.pkg.mk, after bsd.prefs.mk. 4# bsd.pkg.mk, after bsd.prefs.mk.
5 5
6# Package-settable variables: 6# Package-settable variables:
7# 7#
8# USE_BSD_MAKEFILE 8# USE_BSD_MAKEFILE
9# Should be set to "yes" whenever a package uses a BSD-style 9# Should be set to "yes" whenever a package uses a BSD-style
10# Makefile. These Makefiles typically end with a line including 10# Makefile. These Makefiles typically end with a line including
11# <bsd.prog.mk>. 11# <bsd.prog.mk>.
12# Keywords: bsd make bsd.prog.mk 12# Keywords: bsd make bsd.prog.mk
13 13
14# USE_IMAKE 14# USE_IMAKE
@@ -76,27 +76,28 @@ BUILD_DEFS+= KERBEROS @@ -76,27 +76,28 @@ BUILD_DEFS+= KERBEROS
76# LIBTOOL is the publicly-readable variable that should be used by 76# LIBTOOL is the publicly-readable variable that should be used by
77# Makefiles to invoke the proper (wrapped) libtool. 77# Makefiles to invoke the proper (wrapped) libtool.
78# 78#
79.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran) || \ 79.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran) || \
80 defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran77) 80 defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran77)
81. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) # XXX 81. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) # XXX
82PKG_FAIL_REASON+= "Cross-compiling Fortran with libtool NYI." 82PKG_FAIL_REASON+= "Cross-compiling Fortran with libtool NYI."
83. endif 83. endif
84 84
85PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool-fortran 85PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool-fortran
86PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool-fortran 86PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool-fortran
87 87
88. if defined(USE_LIBTOOL) 88. if defined(USE_LIBTOOL)
89BUILD_DEPENDS+= libtool-fortran>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-fortran 89# XXX This really needs cross-libtool-fortran like cross-libtool-base.
 90TOOL_DEPENDS+= libtool-fortran>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-fortran
90. endif 91. endif
91.else 92.else
92. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 93. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
93PKG_LIBTOOL?= ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/libtool 94PKG_LIBTOOL?= ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/libtool
94PKG_SHLIBTOOL?= ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/shlibtool 95PKG_SHLIBTOOL?= ${LOCALBASE}/cross-${TARGET_ARCH:U${MACHINE_ARCH}}/bin/shlibtool
95. else 96. else
96PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool 97PKG_LIBTOOL?= ${LOCALBASE}/bin/libtool
97PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool 98PKG_SHLIBTOOL?= ${LOCALBASE}/bin/shlibtool
98. endif 99. endif
99.endif 100.endif
100LIBTOOL?= ${WRAPPER_BINDIR}/libtool 101LIBTOOL?= ${WRAPPER_BINDIR}/libtool
101SHLIBTOOL?= ${WRAPPER_BINDIR}/shlibtool 102SHLIBTOOL?= ${WRAPPER_BINDIR}/shlibtool
102.if defined(USE_LIBTOOL) 103.if defined(USE_LIBTOOL)