X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=c06a79d07a9b2d4688d661c3d8289a36dad0381b;hb=399b650a6321b9e3f20e9f422b7eb6504a062b47;hp=ef4b68886c864e9f07c7ed44a9b1eba0ea737ae3;hpb=efd82607c9f00d4518c3f650809472c4d16c15bb;p=fedora-riscv.git diff --git a/Makefile b/Makefile index ef4b688..c06a79d 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,14 @@ LOCAL_LINUX_GIT_COPY = $(HOME)/d/linux # 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 = ncurses-devel readline-devel bash coreutils gmp-devel \ +STAGE3_PACKAGES = iso-codes \ +ncurses-devel readline-devel bash coreutils gmp-devel \ mpfr-devel mpc-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 +sed patch hostname gettext-devel lua-devel xz-devel gawk \ +vim # Versions of cross-compiled packages. NCURSES_VERSION = 6.0-20160730 @@ -81,6 +83,9 @@ 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 @@ -310,6 +315,9 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \ stage3-chroot/usr/bin/gettext \ stage3-chroot/usr/bin/lua \ stage3-chroot/usr/bin/rpm \ + stage3-chroot/usr/bin/xz \ + stage3-chroot/usr/bin/gawk \ + stage3-chroot/usr/bin/vim \ stage3-chroot/init \ stage3-disk.img @@ -521,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 \ @@ -533,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 @@ -909,6 +918,66 @@ lua-$(LUA_VERSION).tar.gz: 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. @@ -919,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 \ @@ -929,6 +999,7 @@ 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 \ --with-lua \ --with-beecrypt \