git.annexia.org / fedora-riscv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
stage3: Build xz before rpm, since rpm depends on xz.
[fedora-riscv.git] / Makefile
diff --git a/Makefile b/Makefile
index fd5968a..9a4eefd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,14 +34,21 @@ KERNEL_VERSION   = 4.1.26
 # git commits (optional).
 LOCAL_LINUX_GIT_COPY = $(HOME)/d/linux
 
-# The root packages (plus their dependencies) that we want to
-# cross-compile into the stage 3 chroot.
-# beecrypt-devel is required to build RPM.
-# Packages for usability: nano, grep, less
-STAGE3_PACKAGES = gcc rpm-build beecrypt-devel nano grep less
+# The root packages (plus their dependencies) that we want to in the
+# stage 3 chroot.  This must include all the cross-compiled packages
+# below, and may also include any noarch package we like.
+STAGE3_PACKAGES = iso-codes \
+ncurses-devel readline-devel bash coreutils gmp-devel \
+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 gawk \
+vim
 
 # Versions of cross-compiled packages.
 NCURSES_VERSION    = 6.0-20160730
+READLINE_VERSION   = 6.3
 BASH_VERSION       = 4.3
 COREUTILS_VERSION  = 8.25
 GMP_VERSION        = 6.1.1
@@ -74,6 +81,11 @@ FINDUTILS_VERSION  = 4.6.0
 SED_VERSION        = 4.2
 PATCH_VERSION      = 2.7.5
 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
 
@@ -274,6 +286,7 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
        stage3-chroot/etc/fedora-release \
        stage3-chroot/lib64/libc.so.6 \
        stage3-chroot/usr/bin/tic \
+       stage3-chroot/usr/lib64/libhistory.so.6 \
        stage3-chroot/bin/bash \
        stage3-chroot/bin/ls \
        stage3-chroot/usr/lib64/libgmp.so.10 \
@@ -299,7 +312,12 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
        stage3-chroot/usr/bin/sed \
        stage3-chroot/usr/bin/patch \
        stage3-chroot/usr/bin/hostname \
+       stage3-chroot/usr/bin/gettext \
+       stage3-chroot/usr/bin/lua \
+       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
 
@@ -342,9 +360,9 @@ stage3-chroot-original/etc/fedora-release:
 stage3-chroot/etc/fedora-release: stage3-chroot-original/etc/fedora-release
        rm -rf stage3-chroot
        cp -a stage3-chroot-original stage3-chroot
-       find stage3-chroot -type d | xargs chmod u+w
-       find stage3-chroot -type f | xargs chmod u+w
-       find stage3-chroot -type f | xargs file -N | grep -E '\bELF.*LSB\b' | awk -F: '{print $$1}' | xargs rm -f
+       find stage3-chroot -type d -print0 | xargs -0 chmod u+w
+       find stage3-chroot -type f -print0 | xargs -0 chmod u+w
+       find stage3-chroot -type f -print0 | xargs -0 file -N | grep -E '\bELF.*LSB\b' | awk -F: '{print $$1}' | xargs rm -f
        rm -f stage3-chroot/lib64/libc.so.6
 
 # Copy in compiled glibc from the riscv-gnu-toolchain sysroot.  Only
@@ -376,6 +394,23 @@ ncurses-$(NCURSES_VERSION).tgz:
        wget -O $@-t ftp://invisible-island.net/ncurses/current/ncurses-$(NCURSES_VERSION).tgz
        mv $@-t $@
 
+# Cross-compile readline.
+stage3-chroot/usr/lib64/libhistory.so.6: readline-$(READLINE_VERSION).tar.gz
+       tar zxf $^
+       cd readline-$(READLINE_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       bash_cv_wcwidth_broken=no \
+       ./configure --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd readline-$(READLINE_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd readline-$(READLINE_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+       rm -f stage3-chroot/usr/lib64/*.la
+
+readline-$(READLINE_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t ftp://ftp.gnu.org/gnu/readline/readline-$(READLINE_VERSION).tar.gz
+       mv $@-t $@
+
 # Cross-compile bash.
 stage3-chroot/bin/bash: bash-$(BASH_VERSION).tar.gz
        tar zxf $^
@@ -490,8 +525,11 @@ mpc-$(MPC_VERSION).tar.gz:
 stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz
        rm -rf riscv-gcc-riscv-gcc-$(GCC_X_VERSION)
        zcat $^ | tar xf -
+       cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION) && \
+       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 \
@@ -504,10 +542,9 @@ 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
+       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
 
 gcc-$(GCC_X_VERSION).tar.gz:
        rm -f $@ $@-t
@@ -851,6 +888,96 @@ hostname-$(HOSTNAME_VERSION).tar.gz:
        wget -O $@-t http://ftp.de.debian.org/debian/pool/main/h/hostname/hostname_$(HOSTNAME_VERSION).tar.gz
        mv $@-t $@
 
+# Cross-compile GNU gettext.
+stage3-chroot/usr/bin/gettext: gettext-$(GETTEXT_VERSION).tar.gz
+       rm -rf gettext-$(GETTEXT_VERSION)
+       tar -zxf $^
+       cd gettext-$(GETTEXT_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd gettext-$(GETTEXT_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd gettext-$(GETTEXT_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make install DESTDIR=$(ROOT)/stage3-chroot
+       rm -f stage3-chroot/usr/lib64/*.la
+
+gettext-$(GETTEXT_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t https://ftp.gnu.org/gnu/gettext/gettext-$(GETTEXT_VERSION).tar.gz
+       mv $@-t $@
+
+# Cross-compile lua.
+stage3-chroot/usr/bin/lua: lua-$(LUA_VERSION).tar.gz
+       rm -rf lua-$(LUA_VERSION)
+       tar -zxf $^
+       cd lua-$(LUA_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make PLAT=linux INSTALL_TOP=/usr CC=riscv64-unknown-linux-gnu-gcc AR="riscv64-unknown-linux-gnu-ar rcu" RANLIB="riscv64-unknown-linux-gnu-ranlib" MYLDFLAGS=-L$(ROOT)/stage3-chroot/usr/lib64 MYLIBS=-ltinfo MYCFLAGS="-fPIC -DLUA_COMPAT_5_1"
+       cd lua-$(LUA_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make install INSTALL_TOP=$(ROOT)/stage3-chroot/usr INSTALL_LIB=$(ROOT)/stage3-chroot/usr/lib64
+
+lua-$(LUA_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t https://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
+       mv $@-t $@
+
+# Cross-compile xz.
+stage3-chroot/usr/bin/xz: xz-$(XZ_VERSION).tar.gz
+       rm -rf xz-$(XZ_VERSION)
+       tar -zxf $^
+       cd xz-$(XZ_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd xz-$(XZ_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd xz-$(XZ_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make install DESTDIR=$(ROOT)/stage3-chroot
+       rm -f stage3-chroot/usr/lib64/*.la
+
+xz-$(XZ_VERSION).tar.gz:
+       rm -f $@ $@-t
+       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.
@@ -861,8 +988,9 @@ stage3-chroot/usr/bin/rpm: rpm-$(RPM_SHORT_COMMIT).tar.gz db-$(BDB_VERSION).tar.
        cd rpm-$(RPM_SHORT_COMMIT) && ln -s db-$(BDB_VERSION) db
        cd rpm-$(RPM_SHORT_COMMIT) && \
        patch -p1 < ../0001-RISCV-64-bit-riscv64-support.patch && \
-       patch -p1 < ../0002-build-fgetc-returns-int-not-char.patch && \
-       patch -p1 < ../0003-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch
+       patch -p1 < ../0002-rpmrc-Convert-uname.machine-riscv-to-riscv32-riscv64.patch && \
+       patch -p1 < ../0003-build-fgetc-returns-int-not-char.patch && \
+       patch -p1 < ../0004-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch
        cd rpm-$(RPM_SHORT_COMMIT) && autoreconf -i
        cd rpm-$(RPM_SHORT_COMMIT) && \
        PATH=$(ROOT)/fixed-gcc:$$PATH \
@@ -871,8 +999,9 @@ stage3-chroot/usr/bin/rpm: rpm-$(RPM_SHORT_COMMIT).tar.gz db-$(BDB_VERSION).tar.
            --host=riscv64-unknown-linux-gnu \
            --prefix=/usr --libdir=/usr/lib64 \
            --disable-rpath \
+           --with-vendor=redhat \
            --without-libarchive \
-           --without-lua \
+           --with-lua \
            --with-beecrypt \
            --without-archive \
            --without-external-db \
Fedora RISC-V bootstrapping