CompuExtreme/ViitorMake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Diverse Korrekturen für 32/64 Bit Build

Browse Source 
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5501 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2010-04-09 11:54:05 +00:00
parent 92951717d6
commit c1f3a4b019
1 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
SysBuild/development/ocaml
View File

@ -78,33 +78,66 @@ premk() {
}
mk32() {
cp configure{,.orig}
sed -i "/aspp=/s/'gcc'/'gcc ${BUILDOPTIONS32}'/g" configure &&
USE_ARCH=32 \
./configure -prefix /usr \
-cc "gcc $BUILDOPTIONS32 -L/usr/X11R7/lib"
-x11lib /usr/X11R7/lib
-with-pthread \
-cc "gcc $BUILDOPTIONS32 -L/usr/X11R7/lib" \
-x11lib /usr/X11R7/lib \
-host $TARGET32
make asmcomp/proc.ml &&
sed -i "/Ccomp.command/s/as/as --32/g" asmcomp/proc.ml
make -j $NUMCPU world
make bootstrap
make -j $NUMCPU opt
make -j $NUMCPU opt.opt
make -j $NUMCPU PREFIX=$TMPROOT/usr install
make distclean
cp configure.orig configure
for file in camlp4 camlp4o camlp4o.opt \
camlp4r camlp4r.opt labltk \
mkcamlp4 ocaml ocamlbrowser \
ocamlc ocamlc.opt ocamldebug \
ocamldep ocamldep.opt ocamldoc \
ocamldoc.opt ocamlopt ocamlopt.opt \
ocamlprof ocamlrun ocpp
do
mv -v $TMPROOT/usr/bin/$file{,-32}
done
}
mk() {
if [ "$MK64BIT" == "true" ]; then
ADDOPTIONS="-libdir \${PREFIX}/lib64/ocaml"
ADDOPTIONS="-libdir /usr/lib64/ocaml"
sed -i "/aspp=/s/'gcc'/'gcc ${BUILD64}'/g" configure
fi
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
USE_ARCH=$UARCH \
./configure $ADDOPTIONS \
-prefix /usr \
-cc "gcc $BUILDOPTIONS -L/usr/X11R7/$LIBDIR" \
-x11lib /usr/X11R7/$LIBDIR
-x11lib /usr/X11R7/$LIBDIR \
-host $TARGET
make -j $NUMCPU world
make bootstrap
make -j $NUMCPU PREFIX=$TMPROOT/usr install
make -j $NUMCPU opt
make -j $NUMCPU opt.opt
make -j $NUMCPU PREFIX=$TMPROOT/usr LIBDIR=$TMPROOT/usr/$LIBDIR/ocaml install
}
postmk() {
echo "Nothing to do for postmk()"
if [ "$MK64BIT" == "true" ]; then
for file in camlp4 camlp4o camlp4o.opt \
camlp4r camlp4r.opt labltk \
mkcamlp4 ocaml ocamlbrowser \
ocamlc ocamlc.opt ocamldebug \
ocamldep ocamldep.opt ocamldoc \
ocamldoc.opt ocamlopt ocamlopt.opt \
ocamlprof ocamlrun ocpp
do
mv -v $TMPROOT/usr/bin/$file{,-64}
ln -sfv multiarch_wrapper /usr/bin/$file
done
fi
}