X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=bc220670a4fc8d1e43e42e1a8d4786febf06f7aa;hp=abbf3aba3d898502a77e6accae0a58eea49c0e68;hb=031222f07c4ac6549cfdcb0667114ba5476bbbaf;hpb=5b0cc721fd63727616d6e0bb8ec4e8f0dbc39f9b diff --git a/upstream/Makefile b/upstream/Makefile index abbf3ab..bc22067 100644 --- a/upstream/Makefile +++ b/upstream/Makefile @@ -1,49 +1,40 @@ # Inspired by XWT's Makefile.upstream -version_gcc = 3.3.6 - -url_gcc-core = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz -url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz -url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz - -patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch gcc-3.3.6-fortran.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.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" - -version_binutils = 2.14 -url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz -patches_binutils = binutils-no64.patch binutils-nocompilein.patch -configure_binutils = --target=mips-unknown-elf - -version_newlib = 1.11.0 -url_newlib = ftp://sources.redhat.com/pub/newlib/newlib-$(version_newlib).tar.gz -patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch newlib-unistd.patch -configure_newlib = --enable-multilib --target=mips-unknown-elf - -url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz -url_regex = http://arglist.com/regex/regex3.8a.tar.gz - -url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f -version_zlib = 1.2.3 -url_zlib = http://www.zlib.net/zlib-$(version_zlib).tar.gz - -version_expat = 2.0.0 -url_expat = http://umn.dl.sourceforge.net/sourceforge/expat/expat-$(version_expat).tar.gz -configure_expat = --host= --target=mips-unknown-elf - -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 - +sourceforge = http://softlayer.dl.sourceforge.net/sourceforge/ + +tasks/everything: \ + tasks/build_newlib \ + tasks/build_gcc \ + tasks/build_binutils \ + tasks/build_newlib \ + tasks/build_regex \ + tasks/build_openbsdglob \ + tasks/build_zlib \ + tasks/build_expat \ + tasks/build_gmp \ + tasks/build_expat \ + tasks/build_linker \ + tasks/build_libc \ + tasks/build_libjpeg \ + tasks/build_libmspack \ + tasks/build_freetype \ + tasks/build_boehmgc \ + tasks/build_samba \ + tasks/build_nasm \ + tasks/build_gpc \ + tasks/build_tex \ + tasks/build_tex_tangle \ + tasks/build_tex_weave \ + tasks/build_texinputs \ + tasks/build_busybox \ + tasks/build_linpack \ + + +darcs_gcclass = http://gcclass.ibex.org/ +darcs_classgen = http://classgen.ibex.org/ +git_gcclass = http://gcclass.ibex.org/.git/ +git_classgen = http://classgen.ibex.org/.git/ +cross_root := $(usr)/mips-unknown-elf .SECONDARY: # This is broken in gmake < 3.79.1 upstream = $(shell pwd) @@ -57,15 +48,25 @@ export PATH 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 +# Add extra nestedvm specific headers to include +tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib -cross_root := $(usr)/mips-unknown-elf + cd $(cross_root)/include && sh $< + touch $@ + +top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux) + +# HACK: Get the top level makefile to build the support stuff +$(top_lev_stuff): + $(MAKE) -C .. $(top_lev_stuff:../%=%) + +############################################################################## +# generic build targets ###################################################### tasks/download_%: if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi mkdir -p download - cd download && curl -O $(url_$*) + cd download && curl -LO $(url_$*) touch $@ tasks/extract_%: tasks/download_% @@ -84,8 +85,8 @@ tasks/extract_darcs_%: 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_$*); \ + mkdir -p "build/" && cd "build/"; \ + darcs get --repo-name=$* $(darcs_$*); \ fi touch $@ @@ -93,7 +94,7 @@ 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_$*); \ + cd "build/$*" && darcs get $(darcs_$*); \ fi rm -f "tasks/build_darcs_$*" # to force a rebuild @@ -101,51 +102,34 @@ 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 - - cd $(cross_root)/include && sh $< +tasks/extract_git_%: + if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi + mkdir -p build + if [ -z "$(git_$*)" ]; then echo "No git url for $*" >&2; false; fi + if [ -d "$(root)/.git" ]; then \ + cd build && git clone "$(git_$*)" "$*"; \ + else \ + mkdir -p "build/" && cd "build/"; \ + git clone $(darcs_$*) $*; \ + fi touch $@ -top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux) - -# 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 - - touch $@ +update_git_%: tasks/extract_git_% + if [ -d "build/$*/.git" ]; then \ + cd "build/$*" && git fetch; \ + else \ + cd "build/$*" && git clone $(git_$*); \ + fi + rm -f "tasks/build_git_$*" # to force a rebuild -tasks/build_linker: tasks/build_binutils $(root)/src/org/ibex/nestedvm/linker.ld - cp $(root)/src/org/ibex/nestedvm/linker.ld $(cross_root)/lib/ldscripts/nestedvm.ld - for f in $(cross_root)/lib/ldscripts/elf32ebmip.*; do \ - rm -f "$$f"; \ - ln -s nestedvm.ld "$$f"; \ - done +tasks/build_git_%: tasks/extract_git_% + cd "build/$*" && $(MAKE) touch $@ clean_%: rm -rf "build/$(*)"* rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*" - -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 - - touch $@ - tasks/patch_%: tasks/extract_% if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi cd build/$*-$(version_$*) && \ @@ -162,12 +146,34 @@ tasks/build_%: tasks/patch_% $(MAKE) install touch $@ -tasks/build_zlib: tasks/patch_zlib - mkdir -p $(usr) - cd build/zlib-$(version_zlib) && \ - AR="mips-unknown-elf-ar rc" CC=mips-unknown-elf-gcc ./configure --prefix=$(usr) $(configure_$*) && \ - $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \ - $(MAKE) install +############################################################################## +############################################################################## + + +## gcc ############################################################################## + +version_gcc = 3.3.6 + +url_gcc-core = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz +url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz +url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz + +patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch gcc-with-newer-version.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" + +tasks/build_gcc: tasks/build_linker + +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 - touch $@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc @@ -178,6 +184,15 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc $(MAKE) install touch $@ + +## gpc ############################################################################## + +version_gpc = 20030830 +#url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz +url_gpc = http://nestedvm.ibex.org/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" + 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 @@ -203,6 +218,27 @@ tasks/build_gpc: tasks/patch_gpc tasks/build_libc touch $@ + +## binutils ############################################################################## + +version_binutils = 2.14 +url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz +patches_binutils = binutils-no64.patch binutils-nocompilein.patch +configure_binutils = --target=mips-unknown-elf + +## newlib ############################################################################## + +version_newlib = 1.11.0 +url_newlib = ftp://sources.redhat.com/pub/newlib/newlib-$(version_newlib).tar.gz +patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch newlib-unistd.patch newlib-nestedvm-define.patch +configure_newlib = --enable-multilib --target=mips-unknown-elf + +tasks/build_newlib: tasks/build_gcc + +## openbsdglob ############################################################################## + +url_openbsdglob = http://nestedvm.ibex.org/upstream/openbsdglob.tar.gz + 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 - @@ -215,6 +251,11 @@ tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib cp *.a $(usr)/mips-unknown-elf/lib touch $@ + +## regex ############################################################################## + +url_regex = http://www.arglist.com/regex/files/regex3.8a.tar.gz + tasks/build_regex: tasks/download_regex tasks/build_newlib @mkdir -p $(usr)/mips-unknown-elf/{include,lib} mkdir -p build/regex build/regex/fake @@ -227,6 +268,37 @@ tasks/build_regex: tasks/download_regex tasks/build_newlib cp libregex.a $(usr)/mips-unknown-elf/lib touch $@ + +## linpack ############################################################################## + +url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f + +## zlib ############################################################################## + +version_zlib = 1.2.3 +url_zlib = http://www.zlib.net/zlib-$(version_zlib).tar.gz + +tasks/build_zlib: tasks/patch_zlib + mkdir -p $(usr) + cd build/zlib-$(version_zlib) && \ + AR="mips-unknown-elf-ar rc" CC=mips-unknown-elf-gcc ./configure --prefix=$(usr) $(configure_$*) && \ + $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \ + $(MAKE) install + touch $@ + + +## expat ############################################################################## + +version_expat = 2.0.0 +url_expat = $(sourceforge)expat/expat-$(version_expat).tar.gz +configure_expat = --host= --target=mips-unknown-elf + +## gmp ############################################################################## + +version_gmp = 4.1.4 +url_gmp = ftp://ftp.gnu.org/gnu/gmp/gmp-$(version_gmp).tar.gz +configure_gmp = --host=mips-unknown-elf + tasks/build_gmp: tasks/patch_gmp tasks/build_libc cd build/gmp && \ CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \ @@ -234,39 +306,40 @@ tasks/build_gmp: tasks/patch_gmp tasks/build_libc 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 -# to build or run mips2java -# - -version_libjpeg = 6b -url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz -version_libmspack = 20030726 -url_libmspack = http://www.kyz.uklinux.net/downloads/libmspack-$(version_libmspack).tar.gz -patches_libmspack = libmspack.patch -version_freetype = 2.1.4 -url_freetype = http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-$(version_freetype).tar.gz -patches_freetype = freetype.patch ft-nostdio.patch +## nasm ############################################################################## -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.brianweb.net/misc/gc$(version_boehmgc).tar.gz -patches_boehmgc = boehm-gc.patch +version_nasm = 0.98.39 +url_nasm = $(sourceforge)nasm/nasm-$(version_nasm).tar.gz +configure_nasm = --host=mips-unknown-elf + + +# 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 + + touch $@ + +tasks/build_linker: tasks/build_binutils $(root)/src/org/ibex/nestedvm/linker.ld + cp $(root)/src/org/ibex/nestedvm/linker.ld $(cross_root)/lib/ldscripts/nestedvm.ld + for f in $(cross_root)/lib/ldscripts/elf32ebmip.*; do \ + rm -f "$$f"; \ + ln -s nestedvm.ld "$$f"; \ + done + touch $@ -version_busybox = 1.00-pre9 -url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz -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 + + +## libjpeg ############################################################################## + +version_libjpeg = 7 +url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz tasks/extract_libjpeg: tasks/download_libjpeg mkdir -p build @@ -279,7 +352,7 @@ tasks/extract_libjpeg: tasks/download_libjpeg tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc cd build/libjpeg-$(version_libjpeg) && \ - ./configure && \ + ./configure --host=mips && \ make CC="mips-unknown-elf-gcc" \ AR="mips-unknown-elf-ar rc" \ AR2="mips-unknown-elf-ranlib" \ @@ -287,6 +360,12 @@ tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc LDFLAGS="$(MIPS_LDFLAGS)" touch $@ +## libmspack ############################################################################## + +version_libmspack = 20030726 +url_libmspack = http://www.cabextract.org.uk/libmspack/libmspack-$(version_libmspack).tar.gz +patches_libmspack = libmspack.patch + tasks/extract_libmspack: tasks/download_libmspack tasks/build_libc mkdir -p build cd build && \ @@ -304,6 +383,12 @@ tasks/build_libmspack: tasks/patch_libmspack tasks/build_libc OPTIM="$(MIPS_CFLAGS)" touch $@ +## freetype ############################################################################## + +version_freetype = 2.1.4 +url_freetype = $(sourceforge)freetype/freetype-$(version_freetype).tar.gz +patches_freetype = freetype.patch ft-nostdio.patch + tasks/build_freetype: tasks/patch_freetype tasks/build_libc cd build/freetype-$(version_freetype) && \ $(MAKE) setup ansi && \ @@ -314,6 +399,13 @@ tasks/build_freetype: tasks/patch_freetype tasks/build_libc mips-unknown-elf-ranlib objs/libfreetype.a touch $@ +## boehm-gc ############################################################################## + +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://nestedvm.ibex.org/upstream/gc$(version_boehmgc).tar.gz +patches_boehmgc = boehm-gc.patch + tasks/extract_boehmgc: tasks/download_boehmgc mkdir -p build cd build && \ @@ -332,14 +424,24 @@ tasks/build_boehmgc: tasks/patch_boehmgc tasks/build_libc make gctest touch $@ + +## busybox ############################################################################## + +version_busybox = 1.00-pre9 +url_busybox = http://www.busybox.net/downloads/legacy/busybox-$(version_busybox).tar.gz +patches_busybox = busybox.patch + tasks/build_busybox: tasks/patch_busybox tasks/build_libc cd build && \ rm -f busybox && \ ln -s busybox-$(version_busybox) busybox - cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g" + cd build/busybox && yes | $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g" touch $@ -# TeX Stuff +## tex ############################################################################## + +version_texinputs = 1.0 +url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz tasks/extract_tex_tangle: @mkdir -p build/tex @@ -370,6 +472,12 @@ tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs mips-unknown-elf-gpc $(MIPS_PCFLAGS) tex.p $(MIPS_LDFLAGS) -o tex.mips touch $@ +## samba ############################################################################## + +version_samba = 3.0.4 +url_samba = http://us1.samba.org/samba/ftp/old-versions/samba-$(version_samba).tar.gz +patches_samba = samba.patch + tasks/build_samba: tasks/patch_samba cd build/samba-$(version_samba)/source && \ test -e config.status || ./configure --host=mips-unknown-elf && \