Fix glibc fortran header conflict for arm
v3 cover Fix glibc fortran header conflict for arm
From: Kai Kang <[email protected]>
Tested for qemuarm64 with multilib enabled:
1. set machine and enable multilib
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
MACHINE = "qemuarm64" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7vethf-neon"
2. enable fortran and install to image
FORTRAN:forcevariable = ",fortran" IMAGE_INSTALL:append = " gfortran lib32-gfortran"
3. build image and boot, run gfortran with option '-v' to verify math-vector-fortran.h has been pre-included
for aarch64:
/usr/libexec/gcc/aarch64-poky-linux/14.1.0/f951 hello.f95 -quiet -dumpdir a- -dumpbase hello.f95 -dumpbase-ext .f95 -mlittle-endian -mabi=lp64 -version -fintrinsic-modules-path /usr/lib/gcc/aarch64-poky-linux/14.1.0/finclude -fpre-include=/usr/lib/gcc/aarch64-poky-linux/14.1.0/finclude/math-vector-fortran.h -o /tmp/ccuPIzQY.s
for arm:
/usr/libexec/gcc/arm-pokymllib32-linux-gnueabi/14.1.0/f951 hello.f95 -quiet -dumpdir a- -dumpbase hello.f95 -dumpbase-ext .f95 -mfloat-abi=hard -mtls-dialect=gnu -marm -mlibarch=armv7ve+fp -march=armv7ve+fp -version -fintrinsic-modules-path /usr/lib/gcc/arm-pokymllib32-linux-gnueabi/14.1.0/finclude -fpre-include=/usr/lib/gcc/arm-pokymllib32-linux-gnueabi/14.1.0/finclude/math-vector-fortran.h -o /tmp/cc5pikK8.s
Kai Kang (1):
glibc: fix fortran header file conflict for arm
meta/recipes-core/glibc/glibc-package.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
--
2.34.1
PATCH v3 1/1 glibc: fix fortran header file conflict for arm
From: Kai Kang <[email protected]>
There is a file conflict for arm when multilib enabled:
| Error: Transaction test error:
| file /usr/include/finclude/math-vector-fortran.h conflicts between attempted installs of
lib32-libc6-dev-2.39+git0+312e159626-r0.armv7at2hf_neon and libc6-dev-2.39+git0+312e159626-r0.cortexa72
Install math-vector-fortran.h to the gfortran default search directory which is arch specific to avoid the conflict.
--- meta/recipes-core/glibc/glibc-package.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-package.inc +7 -1
@@ -39,7 +39,7 @@ FILES:sln = "${base_sbindir}/sln" FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" +FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal ${libdir}/gcc/${TARGET_SYS}/*/finclude" RDEPENDS:${PN}-dev = "linux-libc-headers-dev" FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \
@@ -169,6 +169,12 @@ do_install_armmultilib () { oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h } +do_install_armmultilib:append:class-target() { + gcc_version=$($CC -dumpversion) + mkdir -p ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude + mv ${D}${includedir}/finclude/math-vector-fortran.h ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude/ + rmdir --ignore-fail-on-non-empty ${D}${includedir}/finclude +} LOCALESTASH = "${WORKDIR}/stashed-locale" bashscripts = "mtrace sotruss xtrace"
Signature · 1 line
2.34.1