X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=3b461fcab88dc19545b1ad0d011cad1ed720dc20;hb=a9e3833a207eb0813acf7d85e15cfd0165aeb474;hp=5bd53ececcc009db97032358b2cff4932191060e;hpb=eb15d47b4d58a4f841f55a02c77216e24b550b2a;p=fedora-riscv.git

diff --git a/Makefile b/Makefile
index 5bd53ec..3b461fc 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,13 @@ MPC_VERSION        = 1.0.3
 BINUTILS_X_VERSION = 2.26
 GCC_X_VERSION      = 6.1.0
 UTIL_LINUX_VERSION = 2.28
+TAR_VERSION        = 1.29
+GZIP_VERSION       = 1.8
+ZLIB_VERSION       = 1.2.8
+# Needs to match the installed (on host) version, otherwise:
+# "Cannot use the installed version of file (xx) to cross-compile file yy"
+FILE_VERSION       = 5.25
+POPT_VERSION       = 1.16
 
 all: stage1 stage2 stage3 stage4
 
@@ -256,6 +263,11 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
 	stage3-chroot/usr/bin/as \
 	stage3-chroot/usr/bin/gcc \
 	stage3-chroot/usr/bin/mount \
+	stage3-chroot/usr/bin/tar \
+	stage3-chroot/usr/bin/gzip \
+	stage3-chroot/usr/lib64/libz.so \
+	stage3-chroot/usr/bin/file \
+	stage3-chroot/usr/lib64/libpopt.so \
 	stage3-chroot/init \
 	stage3-disk.img
 
@@ -457,6 +469,8 @@ stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz
 	    --disable-libquadmath \
 	    --disable-nls \
 	    --disable-multilib
+# XXX use make all & make install here.  However building libgcc
+# fails, see 'broken-gcc.log'.
 	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && PATH=$(ROOT)/fixed-gcc:$$PATH make all-gcc
 	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && make install-gcc DESTDIR=$(ROOT)/stage3-chroot
 
@@ -489,6 +503,96 @@ util-linux-$(UTIL_LINUX_VERSION).tar.xz:
 	wget -O $@-t ftp://ftp.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_VERSION)/util-linux-$(UTIL_LINUX_VERSION).tar.xz
 	mv $@-t $@
 
+# Cross-compile GNU tar.
+stage3-chroot/usr/bin/tar: tar-$(TAR_VERSION).tar.xz
+	rm -rf tar-$(TAR_VERSION)
+	tar -Jxf $^
+	cd tar-$(TAR_VERSION) && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	./configure \
+	    --host=riscv64-unknown-linux-gnu \
+	    --prefix=/usr --libdir=/usr/lib64
+	cd tar-$(TAR_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+	cd tar-$(TAR_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+tar-$(TAR_VERSION).tar.xz:
+	rm -f $@ $@-t
+	wget -O $@-t https://ftp.gnu.org/gnu/tar/tar-$(TAR_VERSION).tar.xz
+	mv $@-t $@
+
+# Cross-compile GNU gzip.
+stage3-chroot/usr/bin/gzip: gzip-$(GZIP_VERSION).tar.gz
+	rm -rf gzip-$(GZIP_VERSION)
+	tar -zxf $^
+	cd gzip-$(GZIP_VERSION) && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	./configure \
+	    --host=riscv64-unknown-linux-gnu \
+	    --prefix=/usr --libdir=/usr/lib64
+	cd gzip-$(GZIP_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+	cd gzip-$(GZIP_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+gzip-$(GZIP_VERSION).tar.gz:
+	rm -f $@ $@-t
+	wget -O $@-t https://ftp.gnu.org/gnu/gzip/gzip-$(GZIP_VERSION).tar.gz
+	mv $@-t $@
+
+# Cross-compile zlib.
+stage3-chroot/usr/lib64/libz.so: zlib-$(ZLIB_VERSION).tar.gz
+	rm -rf zlib-$(ZLIB_VERSION)
+	tar -zxf $^
+	cd zlib-$(ZLIB_VERSION) && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	CC=riscv64-unknown-linux-gnu-gcc \
+	CFLAGS="-I/home/rjones/d/fedora-riscv/stage3-chroot/usr/include -L/home/rjones/d/fedora-riscv/stage3-chroot/usr/lib" \
+	./configure \
+	    --prefix=/usr --libdir=/usr/lib64
+	cd zlib-$(ZLIB_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make shared
+	cd zlib-$(ZLIB_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+zlib-$(ZLIB_VERSION).tar.gz:
+	rm -f $@ $@-t
+	wget -O $@-t http://zlib.net/zlib-$(ZLIB_VERSION).tar.gz
+	mv $@-t $@
+
+# Cross-compile file/libmagic.
+stage3-chroot/usr/bin/file: file-$(FILE_VERSION).tar.gz
+	rm -rf file-$(FILE_VERSION)
+	tar -zxf $^
+	cd file-$(FILE_VERSION) && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	LDFLAGS=-L/home/rjones/d/fedora-riscv/stage3-chroot/usr/lib64 \
+	./configure \
+	    --host=riscv64-unknown-linux-gnu \
+	    --prefix=/usr --libdir=/usr/lib64 \
+	    --disable-static --enable-shared
+	cd file-$(FILE_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make V=1
+	cd file-$(FILE_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+file-$(FILE_VERSION).tar.gz:
+	rm -f $@ $@-t
+	wget -O $@-t ftp://ftp.astron.com/pub/file/file-$(FILE_VERSION).tar.gz
+	mv $@-t $@
+
+# Cross-compile popt.
+stage3-chroot/usr/lib64/libpopt.so: popt-$(POPT_VERSION).tar.gz
+	rm -rf popt-$(POPT_VERSION)
+	tar -zxf $^
+	cd popt-$(POPT_VERSION) && \
+	PATH=$(ROOT)/fixed-gcc:$$PATH \
+	LDFLAGS=-L/home/rjones/d/fedora-riscv/stage3-chroot/usr/lib64 \
+	./configure \
+	    --host=riscv64-unknown-linux-gnu \
+	    --prefix=/usr --libdir=/usr/lib64 \
+	    --disable-static --enable-shared
+	cd popt-$(POPT_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make V=1
+	cd popt-$(POPT_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+popt-$(POPT_VERSION).tar.gz:
+	rm -f $@ $@-t
+	wget -O $@-t http://rpm5.org/files/popt/popt-$(POPT_VERSION).tar.gz
+	mv $@-t $@
+
 # Create an /init script.
 stage3-chroot/init: init.sh
 	install -m 0755 $^ $@