diff options
| author | Joseph Koshy <jkoshy@FreeBSD.org> | 1999-02-02 03:52:32 +0000 |
|---|---|---|
| committer | Joseph Koshy <jkoshy@FreeBSD.org> | 1999-02-02 03:52:32 +0000 |
| commit | 7fbdc4d2991b22185f7d6d7a1ba58f5d665a304a (patch) | |
| tree | 450921c8dfb899cc833b874b4eb32424e4f5f07e /lang/sml-nj | |
| parent | Add xpm dependency. (diff) | |
Unbreak for ELF.
Notes
Notes:
svn path=/head/; revision=16479
Diffstat (limited to 'lang/sml-nj')
| -rw-r--r-- | lang/sml-nj/Makefile | 7 | ||||
| -rw-r--r-- | lang/sml-nj/files/extra-patch-global-names | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile index 1089bfcc3d4a..01db99cf70c1 100644 --- a/lang/sml-nj/Makefile +++ b/lang/sml-nj/Makefile @@ -3,7 +3,7 @@ # Date created: 7 July 1998 # Whom: jkoshy # -# $Id: Makefile,v 1.3 1998/11/20 08:14:12 jkoshy Exp $ +# $Id: Makefile,v 1.4 1998/11/22 04:46:10 jkoshy Exp $ # DISTNAME= 110.9.1-bin.x86-unix @@ -21,7 +21,6 @@ DISTFILES= 110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \ MAINTAINER= jkoshy@freebsd.org -BROKEN_ELF= build error # Other mirror sites that generally carry only released versions of SML # ftp://rodin.stanford.edu/pub/smlnj/release/ # ftp://ftp.cl.cam.ac.uk/MIRRORED/smlnj/release/ @@ -46,7 +45,9 @@ post-extract: # The build target needs to run $WRKDIR/config/install.sh do-build: - cd ${WRKDIR} && unset PWD && ./config/install.sh + cd ${WRKDIR} && unset PWD && \ + FILESDIR="$(FILESDIR)" PATCH="$(PATCH)" PATCH_ARGS="$(PATCH_ARGS)" \ + ./config/install.sh # install target # 1. create installation directories diff --git a/lang/sml-nj/files/extra-patch-global-names b/lang/sml-nj/files/extra-patch-global-names new file mode 100644 index 000000000000..85d10136ce40 --- /dev/null +++ b/lang/sml-nj/files/extra-patch-global-names @@ -0,0 +1,11 @@ +--- src/runtime/include/asm-base.h-- Thu Aug 6 13:40:30 1998 ++++ src/runtime/include/asm-base.h Mon Feb 1 15:33:00 1999 +@@ -16,7 +16,7 @@ + #define FALSE 0 + #define TRUE 1 + +-#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32)) ++#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32)) + # define GLOBALS_HAVE_UNDERSCORE + #endif + |