diff options
| author | tron <tron> | 1999-12-27 18:20:11 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-12-27 18:20:11 +0000 |
| commit | 8c7340b93faf68e4de167ecb1dac539316fb8914 (patch) | |
| tree | 5192b2f214e3cb4efba3f23224806d0e54288493 /lang | |
| parent | 39830e7abb5b6e82a408caa776d9f000af2a892d (diff) | |
| download | pkgsrc-8c7340b93faf68e4de167ecb1dac539316fb8914.tar.gz | |
- Fix broken object file format recognition.
- Patch memory management to recognize NetBSD-i386 ELF.
XXX This package still doesn't build on ELF systems due to problems with
XXX included assembler sources.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ghc/Makefile | 10 | ||||
| -rw-r--r-- | lang/ghc/files/patch-sum | 4 | ||||
| -rw-r--r-- | lang/ghc/patches/patch-ab | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index d19d26d23a7..31516129811 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/12/16 14:10:14 agc Exp $ +# $NetBSD: Makefile,v 1.4 1999/12/27 18:20:11 tron Exp $ # FreeBSD Id: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp DISTNAME= ghc-4.04 @@ -17,7 +17,7 @@ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-hc-boot --libdir=${PREFIX}/lib/ghc -CONFIGURE_ENV+= HASKELL_OBJ_FMT=`cat ${WRKDIR}/obj_fmt` +CONFIGURE_ENV+= HASKELL_OBJ_FMT=${OBJECT_FMT} WRKSRC= ${WRKDIR}/fptools # a number of non-i386 platforms, including solaris/sparc, osf/alpha @@ -32,12 +32,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 # won't try to create them. # pre-configure: - ( lnl=${WRKDIR}/longandlow; \ - ${ECHO} 'int main(){exit(0);}' > $$lnl.c && \ - ${CC} $$lnl.c -o $$lnl && \ - file $$lnl | ( ${EGREP} '[^a-zA-Z][Ee][Ll][Ff][^a-zA-Z]' && \ - ${ECHO} ELF || ${ECHO} a.out ) \ - ) > ${WRKDIR}/obj_fmt ${SED} < ${WRKSRC}/ghc/driver/ghc.lprl \ > ${WRKSRC}/ghc/driver/ghc.lprl.hacked \ '/push(@SysLibrary, "-l$LibGmp")/s%^%push(@SysLibrary, "-L'${PREFIX}/lib'");%' && \ diff --git a/lang/ghc/files/patch-sum b/lang/ghc/files/patch-sum index 1f46f1fa80d..2fd89d5a7ac 100644 --- a/lang/ghc/files/patch-sum +++ b/lang/ghc/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.2 1999/12/15 18:16:02 proff Exp $ +$NetBSD: patch-sum,v 1.3 1999/12/27 18:20:12 tron Exp $ MD5 (patch-aa) = 80e1756668020337e3c339deef0f2043 -MD5 (patch-ab) = 7eae37b5699254a3051df21b4620ae7b +MD5 (patch-ab) = e000c0fe3512c327f09df5ceea61289a MD5 (patch-ac) = 9ca5ddf9a9a12a5ab48570da1428bfaf MD5 (patch-ad) = 5a32fb21a7612abdf5241d7690342138 MD5 (patch-ae) = e179b2dc235286da48eaa60ffee041d5 diff --git a/lang/ghc/patches/patch-ab b/lang/ghc/patches/patch-ab index ccb354b74ef..17e4ae8a725 100644 --- a/lang/ghc/patches/patch-ab +++ b/lang/ghc/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/12/15 06:05:15 proff Exp $ +$NetBSD: patch-ab,v 1.2 1999/12/27 18:20:12 tron Exp $ --- ghc/rts/MBlock.c Wed Sep 15 09:06:54 1999 +++ ghc/rts/MBlock.c Tue Dec 14 10:27:15 1999 @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/12/15 06:05:15 proff Exp $ */ #define ASK_FOR_MEM_AT 0x50000000 -+#elif netbsd_TARGET_OS ++#elif netbsd_TARGET_OS || netbsd_elf_TARGET_OS +/* NetBSD i386 shared libs are at 0x40000000 + */ +#define ASK_FOR_MEM_AT 0x50000000 |