stage3: Build xz before rpm, since rpm depends on xz.

[fedora-riscv.git] / Makefile

diff --git a/Makefile b/Makefile
index f27ada2..9a4eefd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,11 +39,12 @@ LOCAL_LINUX_GIT_COPY = $(HOME)/d/linux
 # below, and may also include any noarch package we like.
 STAGE3_PACKAGES = iso-codes \
 ncurses-devel readline-devel bash coreutils gmp-devel \
-mpfr-devel mpc-devel binutils gcc gcc-c++ util-linux tar \
+mpfr-devel libmpc-devel binutils gcc gcc-c++ util-linux tar \
 gzip zlib-devel file-devel popt-devel beecrypt-devel \
 rpm rpm-build rpm-devel libdb-utils libdb-devel nano \
 grep less strace bzip2-devel make diffutils findutils \
-sed patch hostname gettext-devel lua-devel xz-devel
+sed patch hostname gettext-devel lua-devel xz-devel gawk \
+vim
 
 # Versions of cross-compiled packages.
 NCURSES_VERSION    = 6.0-20160730
@@ -83,6 +84,8 @@ HOSTNAME_VERSION   = 3.15
 GETTEXT_VERSION    = 0.19
 LUA_VERSION        = 5.3.3
 XZ_VERSION         = 5.2.2
+GAWK_VERSION       = 4.1.3
+VIM_VERSION        = 7.4
 
 all: stage1 stage2 stage3 stage4
 
@@ -311,8 +314,10 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
        stage3-chroot/usr/bin/hostname \
        stage3-chroot/usr/bin/gettext \
        stage3-chroot/usr/bin/lua \
-       stage3-chroot/usr/bin/rpm \
        stage3-chroot/usr/bin/xz \
+       stage3-chroot/usr/bin/rpm \
+       stage3-chroot/usr/bin/gawk \
+       stage3-chroot/usr/bin/vim \
        stage3-chroot/init \
        stage3-disk.img
 
@@ -524,6 +529,7 @@ stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz
        patch -p1 < ../0001-HACKS-TO-GET-GCC-TO-COMPILE.patch
        mkdir riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build
        cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && \
+       gcc_cv_as_leb128=no \
        PATH=$(ROOT)/fixed-gcc:$$PATH \
        ../configure \
            --host=riscv64-unknown-linux-gnu \
@@ -536,7 +542,7 @@ stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz
            --disable-libquadmath \
            --disable-nls \
            --disable-multilib
-       cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && gcc_cv_as_leb128=no PATH=$(ROOT)/fixed-gcc:$$PATH make
        cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && make install DESTDIR=$(ROOT)/stage3-chroot
        rm -f stage3-chroot/usr/lib64/*.la
 
@@ -930,6 +936,48 @@ xz-$(XZ_VERSION).tar.gz:
        wget -O $@-t http://tukaani.org/xz/xz-$(XZ_VERSION).tar.gz
        mv $@-t $@
 
+# Cross-compile GNU awk.
+stage3-chroot/usr/bin/gawk: gawk-$(GAWK_VERSION).tar.gz
+       rm -rf gawk-$(GAWK_VERSION)
+       tar -zxf $^
+       cd gawk-$(GAWK_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd gawk-$(GAWK_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd gawk-$(GAWK_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+gawk-$(GAWK_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t https://ftp.gnu.org/gnu/gawk/gawk-$(GAWK_VERSION).tar.gz
+       mv $@-t $@
+
+# Cross-compile vim.
+stage3-chroot/usr/bin/vim: vim-$(VIM_VERSION).tar.gz
+       rm -rf vim-$(VIM_VERSION)
+       bzcat $^ | tar xf -
+       cd vim74/src && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       vim_cv_memmove_handles_overlap=yes \
+       vim_cv_stat_ignores_slash=no \
+       vim_cv_getcwd_broken=no \
+       vim_cv_tty_group=world \
+       vim_cv_terminfo=yes \
+       vim_cv_toupper_broken=no \
+       LDFLAGS=-L/home/rjones/d/fedora-riscv/stage3-chroot/usr/lib64 \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64 \
+           --with-tlib=tinfo
+       cd vim74/src && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd vim74/src && make install DESTDIR=$(ROOT)/stage3-chroot STRIP=riscv64-unknown-linux-gnu-strip
+
+vim-$(VIM_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t ftp://ftp.vim.org/pub/vim/unix/vim-$(VIM_VERSION).tar.bz2
+       mv $@-t $@
+
 # Cross-compile RPM / rpmbuild.
 # We build this from a git commit, with a few hacks to the configure
 # script.