pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/skalibs Most packages that link with skalibs fai...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/04665d89a408
branches:  trunk
changeset: 446120:04665d89a408
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Feb 04 14:08:23 2021 +0000

description:
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.

diffstat:

 devel/skalibs/buildlink3.mk |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r 6e9feeb12304 -r 04665d89a408 devel/skalibs/buildlink3.mk
--- a/devel/skalibs/buildlink3.mk       Thu Feb 04 13:34:27 2021 +0000
+++ b/devel/skalibs/buildlink3.mk       Thu Feb 04 14:08:23 2021 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index