diff options
Diffstat (limited to 'lang/polyml')
| -rw-r--r-- | lang/polyml/Makefile | 10 | ||||
| -rw-r--r-- | lang/polyml/distinfo | 4 | ||||
| -rw-r--r-- | lang/polyml/patches/patch-polyc.in | 14 |
3 files changed, 23 insertions, 5 deletions
diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile index d5f0ba7c315..ebccc7a6c51 100644 --- a/lang/polyml/Makefile +++ b/lang/polyml/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2014/09/24 09:47:41 asau Exp $ +# $NetBSD: Makefile,v 1.14 2014/09/29 00:55:00 asau Exp $ DISTNAME= polyml.5.5.2 PKGNAME= polyml-5.5.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=polyml/} @@ -26,6 +26,12 @@ SUBST_FILES.rpath= libpolyml/polyml.pc.in SUBST_STAGE.rpath= pre-configure SUBST_MESSAGE.rpath= Adding RPATH flag to pkg-config file. +SUBST_CLASSES+= compiler-rpath +SUBST_SED.compiler-rpath= -e s';@COMPILER_RPATH_FLAG@;${COMPILER_RPATH_FLAG};g' +SUBST_FILES.compiler-rpath= polyc.in +SUBST_STAGE.compiler-rpath= pre-configure +SUBST_MESSAGE.compiler-rpath= Adding RPATH flag to compiler wrapper. + .include "options.mk" .include "../../devel/libffi/buildlink3.mk" diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo index ff6682dd501..bf19a8a8d20 100644 --- a/lang/polyml/distinfo +++ b/lang/polyml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2014/09/24 09:47:41 asau Exp $ +$NetBSD: distinfo,v 1.9 2014/09/29 00:55:00 asau Exp $ SHA1 (polyml.5.5.2.tar.gz) = 8926046162c073d01c1b3bcfc744c63adfafc0d2 RMD160 (polyml.5.5.2.tar.gz) = 3f345e665fb880d02a086179f31944c04f5df79b @@ -6,4 +6,4 @@ Size (polyml.5.5.2.tar.gz) = 5599140 bytes SHA1 (patch-configure) = b4445154d87f11296164cb3fb44d02f1e2fd5553 SHA1 (patch-configure.ac) = 5754c03783c97ff9ccd09d4a35b743f169ed966f SHA1 (patch-libpolyml_elfexport.cpp) = ea2ac256feab994cca53cc5400a8a61e3563811c -SHA1 (patch-polyc.in) = c3014946eb18f2aadea327d2501922f824aa4e1d +SHA1 (patch-polyc.in) = fa27ed1100d6387c72d5a3b19318771533f045b9 diff --git a/lang/polyml/patches/patch-polyc.in b/lang/polyml/patches/patch-polyc.in index a13ec722b57..1df8c3c62ac 100644 --- a/lang/polyml/patches/patch-polyc.in +++ b/lang/polyml/patches/patch-polyc.in @@ -1,4 +1,4 @@ -$NetBSD: patch-polyc.in,v 1.1 2014/09/24 09:47:41 asau Exp $ +$NetBSD: patch-polyc.in,v 1.2 2014/09/29 00:55:00 asau Exp $ --- polyc.in.orig 2014-05-11 11:16:37.000000000 +0000 +++ polyc.in @@ -11,3 +11,15 @@ $NetBSD: patch-polyc.in,v 1.1 2014/09/24 09:47:41 asau Exp $ LIBDIR=@libdir@ LIBS="@LIBS@ @FFI_LIBS@" CFLAGS="@CFLAGS@" +@@ -34,9 +34,9 @@ link() + { + if [ X"$2" = "X" ] + then +- ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} ++ ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS} + else +- ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -o $2 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} ++ ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -o $2 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS} + fi + } + |