Fix compilation script to actually work.diff -r1.9 -r1.10 pkgsrc/lang/polyml/Makefile
(asau)
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2013/12/15 18:35:22 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2014/03/05 22:14:17 asau Exp $ | |
2 | 2 | |||
3 | DISTNAME= polyml.5.5.1 | 3 | DISTNAME= polyml.5.5.1 | |
4 | PKGNAME= polyml-5.5.1 | 4 | PKGNAME= polyml-5.5.1 | |
5 | PKGREVISION= 1 | |||
5 | CATEGORIES= lang | 6 | CATEGORIES= lang | |
6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=polyml/} | 7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=polyml/} | |
7 | 8 | |||
8 | MAINTAINER= asau@NetBSD.org | 9 | MAINTAINER= asau@NetBSD.org | |
9 | HOMEPAGE= http://polyml.org/ | 10 | HOMEPAGE= http://polyml.org/ | |
10 | COMMENT= Poly/ML is an implementation of Standard ML | 11 | COMMENT= Poly/ML is an implementation of Standard ML | |
11 | 12 | |||
12 | # ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc | 13 | # ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc | |
13 | 14 | |||
14 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
15 | CONFIGURE_ARGS= --with-system-libffi | 16 | CONFIGURE_ARGS= --with-system-libffi | |
16 | USE_LIBTOOL= yes | 17 | USE_LIBTOOL= yes | |
17 | USE_LANGUAGES= c c++ | 18 | USE_LANGUAGES= c c++ |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.5 2013/12/15 18:35:22 asau Exp $ | 1 | $NetBSD: distinfo,v 1.6 2014/03/05 22:14:17 asau Exp $ | |
2 | 2 | |||
3 | SHA1 (polyml.5.5.1.tar.gz) = f5a0d289eb0a891af5ac6e897ccc7718ccf32d89 | 3 | SHA1 (polyml.5.5.1.tar.gz) = f5a0d289eb0a891af5ac6e897ccc7718ccf32d89 | |
4 | RMD160 (polyml.5.5.1.tar.gz) = 504a9e8c064355bcee638a3735f7e97b3f92d03e | 4 | RMD160 (polyml.5.5.1.tar.gz) = 504a9e8c064355bcee638a3735f7e97b3f92d03e | |
5 | Size (polyml.5.5.1.tar.gz) = 5465794 bytes | 5 | Size (polyml.5.5.1.tar.gz) = 5465794 bytes | |
6 | SHA1 (patch-buildpolyc) = 9106912954a05355f7eab3b8a531bc016a85ac6c | 6 | SHA1 (patch-buildpolyc) = 43abf4c7a3545ec3b4de62a216009cc7728da848 | |
7 | SHA1 (patch-libpolyml_elfexport.cpp) = 7291a7a1410651bee00662feb5f8d74337c14f3a | 7 | SHA1 (patch-libpolyml_elfexport.cpp) = 7291a7a1410651bee00662feb5f8d74337c14f3a |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-buildpolyc,v 1.1 2013/12/15 18:35:23 asau Exp $ | 1 | $NetBSD: patch-buildpolyc,v 1.2 2014/03/05 22:14:17 asau Exp $ | |
2 | 2 | |||
3 | --- buildpolyc.orig 2013-08-03 12:23:37.000000000 +0000 | 3 | --- buildpolyc.orig 2013-08-03 12:23:37.000000000 +0000 | |
4 | +++ buildpolyc | 4 | +++ buildpolyc | |
5 | @@ -15,9 +15,9 @@ link() | 5 | @@ -15,9 +15,9 @@ link() | |
6 | { | 6 | { | |
7 | if [ X"$2" = "X" ] | 7 | if [ X"$2" = "X" ] | |
8 | then | 8 | then | |
9 | - ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} | 9 | - ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} | |
10 | + ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS} | 10 | + ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS} | |
11 | else | 11 | else | |
12 | - ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} | 12 | - ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} | |
13 | + ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} @COMPILER_RPATH_FLAG@{LIBDIR} -lpolymain -lpolyml ${LIBS} | 13 | + ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS} | |
14 | fi | 14 | fi | |
15 | } | 15 | } | |
16 | 16 |