From 9ec5ac87948109e8bddfca8ef65cc1030fa024ec Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 9 Mar 2016 20:19:31 +0000 Subject: use BUILDLINK_TRANSFORM to handle -ldl --- lang/moscow_ml/Makefile | 5 ++++- lang/moscow_ml/distinfo | 4 ++-- lang/moscow_ml/patches/patch-aa | 20 ++++++-------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile index 4aa729feee6..66ea1ade36b 100644 --- a/lang/moscow_ml/Makefile +++ b/lang/moscow_ml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2015/06/12 10:50:16 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2016/03/09 20:19:31 tnn Exp $ DISTNAME= mos201src PKGNAME= moscow_ml-2.01 @@ -31,6 +31,9 @@ INSTALLATION_DIRS+= share/examples/moscow_ml/units INSTALLATION_DIRS+= share/examples/moscow_ml/weak INSTALLATION_DIRS+= share/examples/moscow_ml/webserver +.include "../../mk/dlopen.buildlink3.mk" +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} + post-extract: ${CHMOD} -x ${WRKDIR}/mosml/examples/modules/matrix.sml diff --git a/lang/moscow_ml/distinfo b/lang/moscow_ml/distinfo index f0c4a7cbe7d..fd7d913e3ca 100644 --- a/lang/moscow_ml/distinfo +++ b/lang/moscow_ml/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.11 2015/12/29 23:34:51 dholland Exp $ +$NetBSD: distinfo,v 1.12 2016/03/09 20:19:31 tnn Exp $ SHA1 (mos201src.tar.gz) = eba58486b10f0359fafba488fa1bf366b2aabf8a RMD160 (mos201src.tar.gz) = b2a9582d8c0bfdad2b8a74740e54ab33d3856637 SHA512 (mos201src.tar.gz) = c08881cad23503bb57c7696ccfe16dd2f716ed423999018c3044266c9329a3175667c5294ef2eda83b5d1ef810fb7fc8e037f9d1fed3245da9dbbc895ad6e15c Size (mos201src.tar.gz) = 2314392 bytes -SHA1 (patch-aa) = c487a4e00f6e918dbe99cdf62c709ea6c9aaa1e6 +SHA1 (patch-aa) = ecbc1a268a8d3182068e9bd16036f220b39346c8 SHA1 (patch-ab) = f4f4d6307a145041e60322c91f1b5359c744cc93 SHA1 (patch-ac) = 270c05d9e887b6f41619a9029c2e228b50f464eb SHA1 (patch-ad) = d76f87ed98eb836e926d0781824531694b287ad7 diff --git a/lang/moscow_ml/patches/patch-aa b/lang/moscow_ml/patches/patch-aa index ad7afe9a20e..b2bd3da1706 100644 --- a/lang/moscow_ml/patches/patch-aa +++ b/lang/moscow_ml/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.7 2015/12/29 23:34:52 dholland Exp $ +$NetBSD: patch-aa,v 1.8 2016/03/09 20:19:31 tnn Exp $ Configure for pkgsrc. XXX: should not be using LOCALBASE. ---- Makefile.inc.orig Thu Jun 29 02:28:14 2000 -+++ Makefile.inc Wed Aug 23 23:39:29 2000 -@@ -2,20 +2,20 @@ +--- Makefile.inc.orig 2004-01-19 15:03:37.000000000 +0000 ++++ Makefile.inc +@@ -2,13 +2,13 @@ # Where to install stuff @@ -21,15 +21,7 @@ XXX: should not be using LOCALBASE. # To compile the runtime system camlrunm with support for # dynamically loadable libraries (DDLs), uncomment these: - - ADDPRIMS=dynlib.c - ADDOBJS=dynlib.o --ADDRUNLIBS=-ldl -+# ADDRUNLIBS=-ldl - ADDRUNCFLAGS= - ADDDYNLIBCFLAGS= - -@@ -45,13 +45,13 @@ +@@ -45,13 +45,13 @@ DYNLD=ld -shared # For NetBSD, use: # ------------------------ @@ -50,7 +42,7 @@ XXX: should not be using LOCALBASE. # For Solaris 2 (not SunOS 4), use: # --------------------------------- -@@ -114,12 +114,12 @@ +@@ -114,12 +114,12 @@ SHELL=/bin/sh # DOCDIR contains documentation BINDIR=${MOSMLHOME}/bin -- cgit v1.2.3