From aa7f7c654ad1d915dec22bd7651d7044b09276ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 17 Jun 2019 15:39:43 +0200 Subject: [PATCH] gcc: fix cross built gcc-fortran OMP modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When cross compiling gcc the OMP support modules for gcc-fortran are not built / installed. As a workaround copy the cross compiler's modules and header files to the destdir. Closes: #12204 Signed-off-by: Jürgen Buchmüller --- srcpkgs/gcc/template | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 9793c23bd56..4b8695b0293 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -7,7 +7,7 @@ _isl_version=0.19 pkgname=gcc version=${_majorver}.0 -revision=1 +revision=2 short_desc="GNU Compiler Collection" maintainer="Juan RP " homepage="http://gcc.gnu.org" @@ -446,6 +446,16 @@ gcc-fortran_package() { vmove usr/lib/gcc/${_triplet}/${_majorver}/f951 vmove usr/lib/gcc/${_triplet}/${_majorver}/libcaf_single.a vmove usr/lib/gcc/${_triplet}/${_majorver}/finclude + if [ "$CROSS_BUILD" ]; then + # A number of OMP modules are not built when cross + # compiling gcc. Copy them from the cross compiler. + local src="/usr/lib/gcc/${_triplet}/${version}/finclude" + local dst="usr/lib/gcc/${_triplet}/${_majorver}/finclude" + for f in omp_lib.f90 omp_lib.h omp_lib.mod omp_lib_kinds.mod \ + openacc.f90 openacc.mod openacc_kinds.mod openacc_lib.h; do + vinstall ${src}/${f} 644 ${dst}/ + done + fi vmove usr/share/info/gfortran.info touch ${PKGDESTDIR}/usr/share/info/dir vmove usr/share/man/man1/gfortran.1