X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=upstream%2FMakefile;h=930f21953129d5ad67fa63cb3ee3ad9231917ad9;hb=6b824fa9a85f2f58fcb938ea5924df0c73cea43c;hp=89cdbcea64bcd95b6af68fa15687cb833ec427c3;hpb=391bbaf9163ef7e66824a9a83c10aa35aa61a3cc;p=nestedvm.git

diff --git a/upstream/Makefile b/upstream/Makefile
index 89cdbce..930f219 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -6,7 +6,7 @@ url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_
 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
 
-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"
@@ -23,7 +23,7 @@ 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
+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
@@ -59,7 +59,7 @@ tasks/download_%:
 	touch $@
 
 tasks/extract_%: tasks/download_%
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	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 - && \
@@ -68,7 +68,7 @@ tasks/extract_%: tasks/download_%
 	touch $@
 
 tasks/extract_darcs_%:
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	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 \
@@ -85,7 +85,7 @@ update_darcs_%: tasks/extract_darcs_%
 	else \
 		cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
 	fi
-	rm "tasks/build_darcs_$*" # to force a rebuild
+	rm -f "tasks/build_darcs_$*" # to force a rebuild
 
 tasks/build_darcs_%: tasks/extract_darcs_%
 	cd "build/$*" && $(MAKE)
@@ -128,7 +128,7 @@ tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/downloa
 	touch $@
 
 tasks/extract_gcc: tasks/download_gcc
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	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 -
@@ -136,10 +136,10 @@ tasks/extract_gcc: tasks/download_gcc
 	touch $@
 
 tasks/patch_%: tasks/extract_%
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	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 $@
 
@@ -160,7 +160,7 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	touch $@
 
 tasks/extract_gpc: tasks/download_gcc tasks/download_gpc
-	@[ -e $@ ] && echo "$@ already exists... something isn't right"
+	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 - && \
@@ -237,6 +237,10 @@ 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 && \
@@ -340,3 +344,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 $@
+
+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 $@