CVS commit: pkgsrc/devel/skalibs

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Feb  4 14:08:23 UTC 2021

Modified Files:
        pkgsrc/devel/skalibs: buildlink3.mk

Log Message:
Most packages that link with skalibs fail configure if the current
platform tuple doesn't match the one skalibs was built with. In pkgsrc,
this almost certainly means the OS has been updated, and almost
certainly doesn't need to break anyone's update builds. Explicitly pass
the contents of ${PREFIX}/lib/skalibs/sysdeps/target as the --target of
those configure scripts, then make sure we don't cross-compile.

skalibs-using packages not needing this workaround can define
SKALIBS_TOLERATE_TARGET_SKEW=no.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/skalibs/buildlink3.mk

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

Modified files:

Index: pkgsrc/devel/skalibs/buildlink3.mk
diff -u pkgsrc/devel/skalibs/buildlink3.mk:1.2 pkgsrc/devel/skalibs/buildlink3.mk:1.3
--- pkgsrc/devel/skalibs/buildlink3.mk:1.2      Mon Jan 11 18:21:30 2021
+++ pkgsrc/devel/skalibs/buildlink3.mk  Thu Feb  4 14:08:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2021/01/11 18:21:30 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/02/04 14:08:23 schmonz Exp $
 
 BUILDLINK_TREE+=       skalibs
 
@@ -8,6 +8,17 @@ SKALIBS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.skalibs+=                skalibs>=2.10.0.0
 BUILDLINK_PKGSRCDIR.skalibs?=          ../../devel/skalibs
 
+SKALIBS_TOLERATE_TARGET_SKEW?=         yes
+.if !empty(SKALIBS_TOLERATE_TARGET_SKEW:M[yY][eE][sS])
+SKALIBS_TARGET_cmd=                    ${CAT} ${PREFIX}/lib/skalibs/sysdeps/target
+CONFIGURE_ARGS+=                       --target=${SKALIBS_TARGET_cmd:sh}
+
+SUBST_CLASSES+=                                skalibs-target
+SUBST_STAGE.skalibs-target=            post-configure
+SUBST_FILES.skalibs-target=            config.mak
+SUBST_SED.skalibs-target=              -e 's|\(CROSS_COMPILE := \).*|\1|'
+.endif # SKALIBS_TOLERATE_TARGET_SKEW
+
 .endif # SKALIBS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -skalibs