From 3e89e48505e3ef05e24e633964c15d5587166ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 7 Mar 2017 18:07:45 +0100 Subject: [PATCH] cross-x86_64-linux-musl: enable fortran + Enable cross fortran compiler + Add isl15-devel to makedepends --- srcpkgs/cross-x86_64-linux-musl/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 51e3acbd665..617a310db03 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -9,8 +9,8 @@ _triplet=x86_64-linux-musl _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.22 -revision=5 +version=0.23 +revision=1 short_desc="Cross toolchain for x86_64 with musl" maintainer="Juan RP " homepage="http://www.voidlinux.eu" @@ -32,8 +32,8 @@ nopie=yes nodebug=yes create_wrksrc=yes hostmakedepends="perl flex" -makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel" -nostrip_files="libgcc.a libgcov.a libgcc_eh.a" +makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" +nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a" depends="${pkgname}-libc-${version}_${revision}" only_for_archs="i686 i686-musl x86_64" @@ -110,8 +110,8 @@ _gcc_bootstrap() { _args+=" libat_cv_have_ifunc=no" _args+=" ${_fpuflags}" - CFLAGS="-O0 -g0" CXXFLAGS="-O0 -g0" \ - ../gcc-${_gcc_version}/configure ${_args} + ../gcc-${_gcc_version}/configure ${_args} + find -name Makefile -exec sed -i "{}" -e "s;^CFLAGS.*;& -fPIC -D__WCHAR_TYPE__=int;" \; make ${makejobs} make install @@ -165,8 +165,9 @@ _gcc_build() { _args="--prefix=/usr" _args+=" --target=${_triplet}" _args+=" --with-sysroot=${_sysroot}" - _args+=" --enable-languages=c,c++,lto" + _args+=" --enable-languages=c,c++,fortran,lto" _args+=" --enable-lto" + _args+=" --enable-libquadmath" _args+=" --disable-libsanitizer" _args+=" --disable-multilib" _args+=" --disable-libmpx" @@ -177,6 +178,7 @@ _gcc_build() { _args+=" ${_fpuflags}" ../gcc-${_gcc_version}/configure ${_args} + find -name Makefile -exec sed -i "{}" -e "s;^CFLAGS.*;& -fPIC -D__WCHAR_TYPE__=int;" \; make ${makejobs} @@ -187,7 +189,7 @@ do_build() { # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS - export CFLAGS="-Os -pipe" CXXFLAGS="-Os -pipe" + export CFLAGS="-Os -pipe -fPIC" CXXFLAGS="-Os -pipe -fPIC" for f in include lib libexec bin sbin; do if [ ! -d ${_sysroot}/usr/${f} ]; then