pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cblas/buildlink3.mk: Eliminate implicit blas.bl3 include



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Jul 26 19:16:48 2019 -0500
Changeset:	a7bbce2b1bdd1f83ad407d6e835ed724962bfb28

Modified Files:
	cblas/buildlink3.mk

Log Message:
cblas/buildlink3.mk: Eliminate implicit blas.bl3 include

Causes issues if package Makefile includes it again

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a7bbce2b1bdd1f83ad407d6e835ed724962bfb28

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

diffstat:
 cblas/buildlink3.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diffs:
diff --git a/cblas/buildlink3.mk b/cblas/buildlink3.mk
index 7b5ce9b6cb..cb368e129d 100644
--- a/cblas/buildlink3.mk
+++ b/cblas/buildlink3.mk
@@ -8,7 +8,11 @@ CBLAS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.cblas+=	cblas>=3.8.0
 BUILDLINK_PKGSRCDIR.cblas?=	../../wip/cblas
 
-.include	"../../wip/mk/blas.buildlink3.mk"
+# Causes problems if cblas/bl3 is included before blas.bl3 in the pkg Makefile.
+# Without this, they can be included in either order.
+# I think pkg Makefiles should include both for clarity rather than have
+# cblas implicitly pull in blas.bl3.
+#.include	"../../wip/mk/blas.buildlink3.mk"
 .endif
 
 BUILDLINK_TREE+=	-cblas


Home | Main Index | Thread Index | Old Index