View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] |
ID | Project | Category | View Status | Date Submitted | Last Update |
0005041 | OCaml | ~DO NOT USE (was: OCaml general) | public | 2010-05-02 01:15 | 2010-05-21 13:46 |
|
Reporter | jessicah | |
Assigned To | | |
Priority | normal | Severity | trivial | Reproducibility | always |
Status | closed | Resolution | fixed | |
Platform | | OS | | OS Version | |
Product Version | 3.11.2 | |
Target Version | | Fixed in Version | 3.12.0+dev | |
|
Summary | 0005041: Make new build system work on *BSD |
Description | Makefiles require GNU make, but using the build/*.sh scripts don't take this into account. |
Additional Information | Attached patch to modify a couple of the build/*.sh scripts to use $MAKE instead of make, and define MAKE=make if not defined.
P.S. patch actually generated from 3.12.0+dev svn, but looks like those files haven't changed much at all :) |
Tags | No tags attached. |
|
Attached Files | ocaml-buildsystem.patch [^] (1,122 bytes) 2010-05-02 01:15 [Show Content] [Hide Content]diff trunk/build/boot-c-parts.sh ocaml-3.12.0+dev/build/boot-c-parts.sh
20,22c20,24
< (cd byterun && make)
< (cd asmrun && make all meta.o dynlink.o)
< (cd yacc && make)
---
> if [ -z "$MAKE" ]; then MAKE=make; fi
>
> (cd byterun && $MAKE)
> (cd asmrun && $MAKE all meta.o dynlink.o)
> (cd yacc && $MAKE)
diff trunk/build/buildbot ocaml-3.12.0+dev/build/buildbot
71c71,73
< ( [ -f config/Makefile ] && make -f $Makefile clean || : ) 2>&1 | log clean
---
> if [ -z "$MAKE" ]; then MAKE=make; fi
>
> ( [ -f config/Makefile ] && $MAKE -f $Makefile clean || : ) 2>&1 | log clean
100c102
< (make -f $Makefile world opt opt.opt install || bad) 2>&1 | log build install
---
> ($MAKE -f $Makefile world opt opt.opt install || bad) 2>&1 | log build install
diff trunk/build/install.sh ocaml-3.12.0+dev/build/install.sh
483c483,484
< (cd ../man && make install)
---
> if [ -z "$MAKE" ]; then MAKE=make; fi
> (cd ../man && $MAKE install)
diff trunk/build/myocamlbuild.sh ocaml-3.12.0+dev/build/myocamlbuild.sh
4a5
> if [ -z "$MAKE" ]; then MAKE=make; fi
7c8
< (cd ocamlbuild && make)
---
> (cd ocamlbuild && $MAKE)
|
|