diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/polyml/Makefile | 13 | ||||
| -rw-r--r-- | lang/polyml/PLIST | 4 | ||||
| -rw-r--r-- | lang/polyml/distinfo | 11 | ||||
| -rw-r--r-- | lang/polyml/patches/patch-buildpolyc | 16 | ||||
| -rw-r--r-- | lang/polyml/patches/patch-libpolyml_elfexport.cpp | 10 |
5 files changed, 39 insertions, 15 deletions
diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile index 747aae031db..b525235ea36 100644 --- a/lang/polyml/Makefile +++ b/lang/polyml/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 14:34:06 asau Exp $ +# $NetBSD: Makefile,v 1.9 2013/12/15 18:35:22 asau Exp $ -DISTNAME= polyml.5.5 -PKGNAME= polyml-5.5 +DISTNAME= polyml.5.5.1 +PKGNAME= polyml-5.5.1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=polyml/} @@ -10,7 +10,6 @@ HOMEPAGE= http://polyml.org/ COMMENT= Poly/ML is an implementation of Standard ML # ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc -# Dumps core on NetBSD/amd64 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-system-libffi @@ -18,6 +17,12 @@ USE_LIBTOOL= yes USE_LANGUAGES= c c++ TEST_TARGET= tests +SUBST_CLASSES+= fix-rpath-flag +SUBST_STAGE.fix-rpath-flag= pre-configure +SUBST_MESSAGE.fix-rpath-flag= Fixing RPATH flag. +SUBST_FILES.fix-rpath-flag= buildpolyc +SUBST_SED.fix-rpath-flag= -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' + .include "options.mk" .include "../../devel/libffi/buildlink3.mk" diff --git a/lang/polyml/PLIST b/lang/polyml/PLIST index 13f47ca57b2..bb85542212d 100644 --- a/lang/polyml/PLIST +++ b/lang/polyml/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/20 21:12:51 asau Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/12/15 18:35:22 asau Exp $ bin/poly +bin/polyc bin/polyimport lib/libpolymain.la lib/libpolyml.la man/man1/poly.1 +man/man1/polyc.1 man/man1/polyimport.1 diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo index 8761f04ca5e..3b5b8ae861f 100644 --- a/lang/polyml/distinfo +++ b/lang/polyml/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2012/10/08 14:33:32 asau Exp $ +$NetBSD: distinfo,v 1.5 2013/12/15 18:35:22 asau Exp $ -SHA1 (polyml.5.5.tar.gz) = 9b308d3ac69316d1fcb0f6ac5f9b9e2d2390d511 -RMD160 (polyml.5.5.tar.gz) = a2daf4230e7643c1febb455dea0c4f5682096d63 -Size (polyml.5.5.tar.gz) = 5504389 bytes -SHA1 (patch-libpolyml_elfexport.cpp) = b32d52ea2a0b00b15cab1ec3aff0dac84add1d56 +SHA1 (polyml.5.5.1.tar.gz) = f5a0d289eb0a891af5ac6e897ccc7718ccf32d89 +RMD160 (polyml.5.5.1.tar.gz) = 504a9e8c064355bcee638a3735f7e97b3f92d03e +Size (polyml.5.5.1.tar.gz) = 5465794 bytes +SHA1 (patch-buildpolyc) = 9106912954a05355f7eab3b8a531bc016a85ac6c +SHA1 (patch-libpolyml_elfexport.cpp) = 7291a7a1410651bee00662feb5f8d74337c14f3a diff --git a/lang/polyml/patches/patch-buildpolyc b/lang/polyml/patches/patch-buildpolyc new file mode 100644 index 00000000000..b19e8663f5e --- /dev/null +++ b/lang/polyml/patches/patch-buildpolyc @@ -0,0 +1,16 @@ +$NetBSD: patch-buildpolyc,v 1.1 2013/12/15 18:35:23 asau Exp $ + +--- buildpolyc.orig 2013-08-03 12:23:37.000000000 +0000 ++++ buildpolyc +@@ -15,9 +15,9 @@ link() + { + if [ X"$2" = "X" ] + then +- ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} ++ ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS} + else +- ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} -lpolymain -lpolyml ${LIBS} ++ ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} @COMPILER_RPATH_FLAG@{LIBDIR} -lpolymain -lpolyml ${LIBS} + fi + } + diff --git a/lang/polyml/patches/patch-libpolyml_elfexport.cpp b/lang/polyml/patches/patch-libpolyml_elfexport.cpp index df1a7952dec..5172efb0930 100644 --- a/lang/polyml/patches/patch-libpolyml_elfexport.cpp +++ b/lang/polyml/patches/patch-libpolyml_elfexport.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-libpolyml_elfexport.cpp,v 1.1 2012/03/22 20:48:45 asau Exp $ +$NetBSD: patch-libpolyml_elfexport.cpp,v 1.2 2013/12/15 18:35:23 asau Exp $ ---- libpolyml/elfexport.cpp.orig 2010-04-14 22:13:42.000000000 +0000 +--- libpolyml/elfexport.cpp.orig 2013-06-11 11:13:52.000000000 +0000 +++ libpolyml/elfexport.cpp -@@ -62,6 +62,13 @@ - #ifdef HAVE_SYS_ELF_386_H - #include <sys/elf_386.h> +@@ -65,6 +65,13 @@ + #ifdef HAVE_SYS_ELF_AMD64_H + #include <sys/elf_amd64.h> #endif +#if defined(__NetBSD__) && defined(HOSTARCHITECTURE_X86_64) +#include <i386/elf_machdep.h> |