X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=59a9eff7883377be7f496303152953e3997f1fba;hp=63fde0976e8021f53eb1b641bbcc923bea66f979;hb=f9d53cdf4016db2ff68f1fd3e092b889fcee8cf1;hpb=878d27353651984fcf1afd51e6ec57f633af60b7 diff --git a/upstream/Makefile b/upstream/Makefile index 63fde09..59a9eff 100644 --- a/upstream/Makefile +++ b/upstream/Makefile @@ -1,18 +1,18 @@ # Inspired by XWT's Makefile.upstream -version_gcc = 3.3 +version_gcc = 3.3.3 -url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz -url_gcc-c++ = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz -url_gcc-g77 = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz +url_gcc-core = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz +url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz +url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz -patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch +patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch configure_gcc = --target=mips-unknown-elf --disable-threads --with-gnu-ld --with-gnu-as --with-newlib=yes --enable-sjlj-exceptions --enable-languages="c" configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,f77" - version_gpc = 20030830 -url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz +#url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz +url_gpc = http://www.megacz.com/upstream/gpc-$(version_gpc).tar.gz patches_gpc = $(patches_gcc) gpc-with-3.3.3.patch gpc-noutils.patch configure_gpc = $(configure_gcc) --enable-languages="pascal" @@ -22,18 +22,22 @@ patches_binutils = binutils-no64.patch binutils-nocompilein.patch configure_binutils = --target=mips-unknown-elf version_newlib = 1.11.0 -url_newlib = http://mirrors.rcn.net/pub/sourceware/newlib/newlib-$(version_newlib).tar.gz -patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-vasprintf.patch newlib-nomemcpy.patch +url_newlib = http://mirrors.kernel.org/gnu/newlib/newlib-$(version_newlib).tar.gz +patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch configure_newlib = --enable-multilib --target=mips-unknown-elf url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz url_regex = ftp://ftp.zoo.toronto.edu/pub/regex.shar -version_bcel = 5.1 -url_bcel = http://mirrors.mix5.com/apache/jakarta/bcel/binaries/bcel-$(version_bcel).tar.gz - url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f +version_gmp = 4.1.4 +url_gmp = ftp://ftp.gnu.org/gnu/gmp/gmp-$(version_gmp).tar.gz +configure_gmp = --host=mips-unknown-elf + +darcs_gcclass = http://darcs.brianweb.net/gcclass +darcs_classgen = http://darcs.brianweb.net/classgen + .SECONDARY: # This is broken in gmake < 3.79.1 upstream = $(shell pwd) @@ -45,24 +49,68 @@ export PATH # Solaris' patch doesn't work, use gnu patch on solaris PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch) +TAR = $(shell test `uname` = SunOS && echo gtar || echo tar) tasks/build_gcc: tasks/build_linker tasks/build_newlib: tasks/build_gcc cross_root := $(usr)/mips-unknown-elf -libc_a := $(cross_root)/lib/libc.a +tasks/download_%: + if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi + mkdir -p download + cd download && curl -O $(url_$*) + touch $@ + +tasks/extract_%: tasks/download_% + if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi + mkdir -p build + cd build && \ + gzip -dc ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \ + rm -f $* && \ + ln -s $*-$(version_$*) $* + touch $@ + +tasks/extract_darcs_%: + if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi + mkdir -p build + if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi + if [ -d "$(root)/_darcs" ]; then \ + cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \ + else \ + mkdir -p "build/$*" && cd "build/$*"; \ + wget -nH -rl 16 -N -X _darcs $(darcs_$*); \ + fi + touch $@ + +update_darcs_%: tasks/extract_darcs_% + if [ -d "build/$*/_darcs" ]; then \ + cd "build/$*" && darcs pull; \ + else \ + cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \ + fi + rm -f "tasks/build_darcs_$*" # to force a rebuild + +tasks/build_darcs_%: tasks/extract_darcs_% + cd "build/$*" && $(MAKE) + touch $@ + +# Add extra nestedvm specific headers to include tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib - # Add extra nestedvm specific headers to include + cd $(cross_root)/include && sh $< touch $@ -tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob - # HACK: Get the top level makefile to build the support stuff - make -s -C $(root) build/org/ibex/nestedvm/{crt0.o,support.o,support_aux.o} +top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux) - # Add our support stuff to libc - mips-unknown-elf-ar sr $(libc_a) $(root)/build/org/ibex/nestedvm/{support.o,support_aux.o} +# HACK: Get the top level makefile to build the support stuff +$(top_lev_stuff): + $(MAKE) -C .. $(top_lev_stuff:../%=%) + +# Add our support stuff to libc +tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(top_lev_stuff) + mips-unknown-elf-ar sr $(cross_root)/lib/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux) + mips-unknown-elf-ar sr $(cross_root)/lib/single-float/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux) rm -f $(cross_root)/lib/crt0.o cp $(root)/build/org/ibex/nestedvm/crt0.o $(cross_root)/lib/crt0.o @@ -81,34 +129,22 @@ clean_%: rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*" -tasks/download_%: - if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi - mkdir -p download - cd download && wget --passive-ftp -N $(url_$*) - touch $@ - -tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ - touch $@ - -tasks/extract_%: tasks/download_% - mkdir -p build - cd build && \ - gzip -dc ../download/$*-$(version_$*).tar.gz | tar xf - && \ - rm -f $* && \ - ln -s $*-$(version_$*) $* +tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77 touch $@ tasks/extract_gcc: tasks/download_gcc + if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi mkdir -p build - cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | tar xf - - cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | tar xf - - cd build && gzip -dc ../download/gcc-g77-$(version_gcc).tar.gz | tar xf - + cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - + cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | $(TAR) -xf - + cd build && gzip -dc ../download/gcc-g77-$(version_gcc).tar.gz | $(TAR) -xf - touch $@ tasks/patch_%: tasks/extract_% + if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi cd build/$*-$(version_$*) && \ for p in $(patches_$*) end; do \ - [ "$$p" = "end" ] || $(PATCH) -p0 < ../../patches/$$p || exit 1; \ + [ "$$p" = "end" ] || $(PATCH) -p0 -l < ../../patches/$$p || exit 1; \ done touch $@ @@ -124,15 +160,16 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc mkdir -p $(usr) mkdir -p build/gcc-obj && cd build/gcc-obj && \ echo | ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \ - $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/install/bin/mips-unknown-elf-gcc && \ + $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \ $(MAKE) install touch $@ tasks/extract_gpc: tasks/download_gcc tasks/download_gpc + if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi mkdir -p build/gpc.extract cd build/gpc.extract && \ - gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | tar xf - && \ - gzip -dc ../../download/gpc-$(version_gpc).tar.gz | tar xf - && \ + gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - && \ + gzip -dc ../../download/gpc-$(version_gpc).tar.gz | $(TAR) -xf - && \ test ! -e gcc-$(version_gcc)/gcc/p && \ mv gpc-$(version_gpc)/p gcc-$(version_gcc)/gcc/p mv build/gpc.extract/gcc-$(version_gcc) build/gpc-$(version_gpc) @@ -141,20 +178,20 @@ tasks/extract_gpc: tasks/download_gcc tasks/download_gpc tasks/build_gpc: tasks/patch_gpc tasks/build_libc mkdir -p $(usr) - # We need to preapply this patch because gpc's configury doesn't like 3.3.3 + # We need to preapply this patch because gpc's configury doesn't like 3.3.3 cd build/gpc-$(version_gpc) && cat gcc/version.c | grep -q GPC || $(PATCH) -p0 < gcc/p/diffs/gcc-3.3.diff - - # echo | is to dismiss the gcc version warning + + # echo | is to dismiss the gcc version warning mkdir -p build/gpc-obj && cd build/gpc-obj && \ echo | ../gpc-$(version_gpc)/configure --prefix=$(usr) $(configure_gpc) && \ $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \ cd gcc && $(MAKE) pascal.install - + touch $@ tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib @mkdir -p $(usr)/mips-unknown-elf/{include,lib} - cd build && gzip -dc ../download/openbsdglob.tar.gz | tar xf - + cd build && gzip -dc ../download/openbsdglob.tar.gz | $(TAR) -xf - cd build/openbsdglob && \ mips-unknown-elf-gcc '-Dissetugid()=0' -DARG_MAX=65536 $(MIPS_CFLAGS) -I. -c -o glob.o glob.c && \ mips-unknown-elf-gcc -O2 -Wall -Werror -I. -c -o fnmatch.o fnmatch.c && \ @@ -176,7 +213,14 @@ tasks/build_regex: tasks/download_regex tasks/build_newlib cp libregex.a $(usr)/mips-unknown-elf/lib touch $@ - +tasks/build_gmp: tasks/patch_gmp tasks/build_libc + cd build/gmp && \ + CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \ + ./configure --prefix=$(usr) $(configure_gmp) && \ + make && \ + make install exec_prefix=$(usr)/mips-unknown-elf includedir=$(usr)/mips-unknown-elf/include + touch $@ + # # Tests # These are simply here for convenience. They aren't required @@ -191,11 +235,12 @@ url_libmspack = http://www.kyz.uklinux.net/downloads/libmspack-$(version_libmspa patches_libmspack = libmspack.patch version_freetype = 2.1.4 -url_freetype = http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-$(version_freetype).tar.gz +url_freetype = http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-$(version_freetype).tar.gz patches_freetype = freetype.patch ft-nostdio.patch version_boehmgc = 6.3alpha2 -url_boehmgc = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc$(version_boehmgc).tar.gz +#url_boehmgc = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc$(version_boehmgc).tar.gz +url_boehmgc = http://www.brianweb.net/misc/gc$(version_boehmgc).tar.gz patches_boehmgc = boehm-gc.patch version_busybox = 1.00-pre9 @@ -205,10 +250,14 @@ patches_busybox = busybox.patch version_texinputs = 1.0 url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz +version_samba = 3.0.4 +url_samba = http://us4.samba.org/samba/ftp/samba-$(version_samba).tar.gz +patches_samba = samba.patch + tasks/extract_libjpeg: tasks/download_libjpeg mkdir -p build cd build && \ - gzip -dc ../download/jpegsrc.v$(version_libjpeg).tar.gz | tar xf - && \ + gzip -dc ../download/jpegsrc.v$(version_libjpeg).tar.gz | $(TAR) -xf - && \ mv jpeg-$(version_libjpeg) libjpeg-$(version_libjpeg) && \ rm -f libjpeg && \ ln -s libjpeg-$(version_libjpeg) libjpeg @@ -227,7 +276,7 @@ tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc tasks/extract_libmspack: tasks/download_libmspack tasks/build_libc mkdir -p build cd build && \ - gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | tar xf - && \ + gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | $(TAR) -xf - && \ mv libmspack libmspack-$(version_libmspack) && \ rm -f libmspack && \ ln -s libmspack-$(version_libmspack) libmspack @@ -255,7 +304,7 @@ tasks/extract_boehmgc: tasks/download_boehmgc mkdir -p build cd build && \ rm -rf gc$(version_boehmgc) && \ - gzip -dc ../download/gc$(version_boehmgc).tar.gz | tar xf - && \ + gzip -dc ../download/gc$(version_boehmgc).tar.gz | $(TAR) -xf - && \ rm -f boehmgc boehmgc-$(version_boehmgc) && \ ln -s gc$(version_boehmgc) boehmgc && \ ln -s gc$(version_boehmgc) boehmgc-$(version_boehmgc) @@ -276,18 +325,11 @@ tasks/build_busybox: tasks/patch_busybox tasks/build_libc cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g" touch $@ -tasks/build_gcclass: - cd build && darcs get --verbose http://darcs.brianweb.net/gcclass - cd build/gcclass && make - touch $@ - # TeX Stuff tasks/extract_tex_tangle: @mkdir -p build/tex - cd build/tex && \ - curl -o tex.web http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web && \ - curl http://www.gnu-pascal.de/crystal/gpc/en/attachments/5593/tangle.p.gz | zcat > tangle.p + cd build/tex && curl -o tex.web http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web touch $@ tasks/build_tex_tangle: tasks/extract_tex_tangle tasks/build_gpc @@ -297,19 +339,28 @@ tasks/build_tex_tangle: tasks/extract_tex_tangle tasks/build_gpc tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs @mkdir -p build/tex - - # HACK: Build Tangel.class + + # HACK: Build Tangel.class make -C $(root) build/tests/Tangle.class - + rm -f build/tex/tex.p build/tex/tex.pool cp misc/tex.ch build/tex/tex.ch cd build/tex && \ - tar xfz ../../download/texinputs-$(version_texinputs).tgz && \ - java -cp $(root)/build tests.Tangle \ + $(TAR) xfz ../../download/texinputs-$(version_texinputs).tgz && \ + java -cp $(root)/build:$(upstream)/build/classgen/build tests.Tangle \ --gpc-rts=-nPascalfile:tex.p \ --gpc-rts=-npool:tex.pool \ --gpc-rts=-nwebfile:tex.web \ --gpc-rts=-nchangefile:tex.ch \ && \ - mips-unknown-elf-gpc $(filter-out -Werror,$(MIPS_PCFLAGS)) tex.p $(MIPS_LDFLAGS) -o tex.mips + mips-unknown-elf-gpc $(MIPS_PCFLAGS) tex.p $(MIPS_LDFLAGS) -o tex.mips + touch $@ + +tasks/build_samba: tasks/patch_samba + cd build/samba-$(version_samba)/source && \ + test -e config.status || ./configure --host=mips-unknown-elf && \ + fgrep -q '#define HAVE_GETTIMEOFDAY_TZ' include/config.h || \ + echo '#define HAVE_GETTIMEOFDAY_TZ 1' >> include/config.h && \ + make LIBS="-lglob" CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \ + CONFIGFILE="smb.conf" proto_exists bin/ntlm_auth touch $@