projects
/
nestedvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e1a4df
)
upstream dep fixes
author
brian
<brian@brianweb.net>
Fri, 21 May 2004 04:38:46 +0000
(21:38 -0700)
committer
brian
<brian@brianweb.net>
Fri, 21 May 2004 04:38:46 +0000
(21:38 -0700)
darcs-hash:
20040521043846
-24bed-
c877fcabf09a444fc65173846b6a5ea2e98af18d
.gz
upstream/Makefile
patch
|
blob
|
history
diff --git
a/upstream/Makefile
b/upstream/Makefile
index
9d233e0
..
bade846
100644
(file)
--- a/
upstream/Makefile
+++ b/
upstream/Makefile
@@
-222,12
+222,6
@@
tasks/build_regex: tasks/download_regex tasks/build_newlib
# to build or run mips2java
#
# to build or run mips2java
#
-tasks/build_freetype: tasks/full_toolchain
-tasks/build_libjpeg: tasks/full_toolchain
-tasks/build_boehmgc: tasks/full_toolchain
-tasks/build_libmspack: tasks/full_toolchain
-tasks/build_freetype: tasks/full_toolchain
-
version_libjpeg = 6b
url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz
version_libjpeg = 6b
url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz
@@
-256,7
+250,7
@@
tasks/extract_libjpeg: tasks/download_libjpeg
ln -s libjpeg-$(version_libjpeg) libjpeg
touch $@
ln -s libjpeg-$(version_libjpeg) libjpeg
touch $@
-tasks/build_libjpeg: tasks/patch_libjpeg
+tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc
cd build/libjpeg-$(version_libjpeg) && \
./configure && \
make CC="mips-unknown-elf-gcc" \
cd build/libjpeg-$(version_libjpeg) && \
./configure && \
make CC="mips-unknown-elf-gcc" \
@@
-266,7
+260,7
@@
tasks/build_libjpeg: tasks/patch_libjpeg
LDFLAGS="$(MIPS_LDFLAGS)"
touch $@
LDFLAGS="$(MIPS_LDFLAGS)"
touch $@
-tasks/extract_libmspack: tasks/download_libmspack
+tasks/extract_libmspack: tasks/download_libmspack tasks/build_libc
mkdir -p build
cd build && \
gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | tar xf - && \
mkdir -p build
cd build && \
gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | tar xf - && \
@@
-275,7
+269,7
@@
tasks/extract_libmspack: tasks/download_libmspack
ln -s libmspack-$(version_libmspack) libmspack
touch $@
ln -s libmspack-$(version_libmspack) libmspack
touch $@
-tasks/build_libmspack: tasks/patch_libmspack tasks/full_toolchain
+tasks/build_libmspack: tasks/patch_libmspack tasks/build_libc
cd build/libmspack-$(version_libmspack)/mspack && \
make CC="mips-unknown-elf-gcc" \
AR="mips-unknown-elf-ar" \
cd build/libmspack-$(version_libmspack)/mspack && \
make CC="mips-unknown-elf-gcc" \
AR="mips-unknown-elf-ar" \
@@
-283,7
+277,7
@@
tasks/build_libmspack: tasks/patch_libmspack tasks/full_toolchain
OPTIM="$(MIPS_CFLAGS)"
touch $@
OPTIM="$(MIPS_CFLAGS)"
touch $@
-tasks/build_freetype: tasks/patch_freetype tasks/full_toolchain
+tasks/build_freetype: tasks/patch_freetype tasks/build_libc
cd build/freetype-$(version_freetype) && \
$(MAKE) setup ansi && \
$(MAKE) CC="mips-unknown-elf-gcc" \
cd build/freetype-$(version_freetype) && \
$(MAKE) setup ansi && \
$(MAKE) CC="mips-unknown-elf-gcc" \
@@
-303,7
+297,7
@@
tasks/extract_boehmgc: tasks/download_boehmgc
ln -s gc$(version_boehmgc) boehmgc-$(version_boehmgc)
touch $@
ln -s gc$(version_boehmgc) boehmgc-$(version_boehmgc)
touch $@
-tasks/build_boehmgc: tasks/patch_boehmgc tasks/full_toolchain
+tasks/build_boehmgc: tasks/patch_boehmgc tasks/build_libc
cd build/gc$(version_boehmgc) && \
CC="mips-unknown-elf-gcc" CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \
./configure --host=mips-unknown-elf --disable-shared --disable-threads && \
cd build/gc$(version_boehmgc) && \
CC="mips-unknown-elf-gcc" CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \
./configure --host=mips-unknown-elf --disable-shared --disable-threads && \
@@
-311,7
+305,7
@@
tasks/build_boehmgc: tasks/patch_boehmgc tasks/full_toolchain
make gctest
touch $@
make gctest
touch $@
-tasks/build_busybox: tasks/patch_busybox tasks/full_toolchain
+tasks/build_busybox: tasks/patch_busybox tasks/build_libc
cd build && \
rm -f busybox && \
ln -s busybox-$(version_busybox) busybox
cd build && \
rm -f busybox && \
ln -s busybox-$(version_busybox) busybox