diff options
| author | tv <tv@pkgsrc.org> | 2005-01-19 17:43:59 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-19 17:43:59 +0000 |
| commit | f0b07e06e5976ee2f1d23e63a183bc302366a424 (patch) | |
| tree | eacd4e4720bdfe05b903fc9884aaeed1ed5829da /lang/ocaml | |
| parent | a0d80c958bcc5e645088e10f918ae609326112d1 (diff) | |
| download | pkgsrc-f0b07e06e5976ee2f1d23e63a183bc302366a424.tar.gz | |
Override config.guess and config.sub manually, since GNU_CONFIGURE is not
correct here (and thus automatic overriding doesn't work).
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile.common | 8 | ||||
| -rw-r--r-- | lang/ocaml/distinfo | 3 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-as | 13 |
3 files changed, 7 insertions, 17 deletions
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index a8664c69d5b..052f700a8cc 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2004/12/24 17:16:04 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/01/19 17:43:59 tv Exp $ DISTNAME= ocaml-3.06 CATEGORIES= lang @@ -24,9 +24,13 @@ CONFIGURE_ARGS+= -with-pthread INSTALL_UNSTRIPPED= yes .endif -post-extract: cp-power-bsd +post-extract: cp-power-bsd cp-gnu-config cp-power-bsd: ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S +cp-gnu-config: + ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/ + ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/ + .include "../../mk/pthread.buildlink3.mk" diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 90a1d6d501b..694cb7a494f 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2004/12/24 17:16:04 jmmv Exp $ +$NetBSD: distinfo,v 1.19 2005/01/19 17:43:59 tv Exp $ SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863 Size (ocaml-3.06.tar.gz) = 2436887 bytes @@ -20,7 +20,6 @@ SHA1 (patch-ao) = e517897e687fdcf43b2c4d801906e6894c6c4916 SHA1 (patch-ap) = 852b73b2a75442e32ae6eca40b87ccb972555143 SHA1 (patch-aq) = 86b1c641f5adf4fd13b49b8d3149d266b4863d05 SHA1 (patch-ar) = b52759d59840fb0e156ede1192ea3cfc66df88a7 -SHA1 (patch-as) = e2fe81931265e70cdb9fcb7b9f743ac39ea45528 SHA1 (patch-at) = 13f1b894a662510a16f86d63f015e2e8cfde3403 SHA1 (patch-au) = 348834bb0a5e22fd1adce0003f73cd6bcc07e79d SHA1 (patch-av) = d61391c89398e0e2b0386f39247a693aa87baf74 diff --git a/lang/ocaml/patches/patch-as b/lang/ocaml/patches/patch-as deleted file mode 100644 index b2e614c5df1..00000000000 --- a/lang/ocaml/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.1 2004/04/22 09:18:38 tron Exp $ - ---- config/gnu/config.sub.orig Mon Jun 25 16:04:51 2001 -+++ config/gnu/config.sub Thu Apr 22 10:34:37 2004 -@@ -289,7 +289,7 @@ - | [cjt]90-* \ - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ -- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) -+ | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-* | macppc-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. |