From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 01/15] package/gcc: fix fortran support
Date: Fri, 1 Jul 2016 18:29:06 +0200 [thread overview]
Message-ID: <20160701162920.19632-2-s.martin49@gmail.com> (raw)
In-Reply-To: <20160701162920.19632-1-s.martin49@gmail.com>
Fortran depends on libquadmath, which requires a toolchain with wchar
support.
So:
- make sure libquadmath is enable and installed when fortran is enabled;
- propagate the wchar dependency (from libquadmath) to fortran, and add
a comment when fortran is not available.
[Vincent: only do "HOST_GCC_FINAL_USR_LIBS += libquadmath" for i386 and
x86_64, otherwise it will fail saying "libquadmath.a: file not found"]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
changes v1->v2:
- none
---
package/gcc/Config.in.host | 4 ++++
package/gcc/gcc-final/gcc-final.mk | 4 ++++
package/gcc/gcc.mk | 5 +++++
3 files changed, 13 insertions(+)
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 44a72f1..673b444 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -120,11 +120,15 @@ config BR2_TOOLCHAIN_BUILDROOT_CXX
config BR2_TOOLCHAIN_BUILDROOT_FORTRAN
bool "Enable Fortran support"
+ depends on BR2_USE_WCHAR # libquadmath
help
Enable this option if you want your toolchain to support the
Fortran language and you want Fortran libraries to be
installed on your target system.
+comment "Fortran support needs a toolchain w/ wchar"
+ depends on !BR2_USE_WCHAR
+
config BR2_GCC_ENABLE_TLS
bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
default y
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 78ceeba..f13bc36 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -163,6 +163,10 @@ endif
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_FORTRAN),y)
HOST_GCC_FINAL_USR_LIBS += libgfortran
+# fortran needs quadmath on x86 and x86_64
+ifeq ($(BR2_I386)$(BR2_x86_64),y)
+HOST_GCC_FINAL_USR_LIBS += libquadmath
+endif
endif
ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 6e1c02d..e981940 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -109,6 +109,11 @@ endif
# quadmath support requires wchar
ifeq ($(BR2_USE_WCHAR),)
HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath
+else
+# fortran needs quadmath on x86 and x86_64
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT_FORTRAN)$(BR2_I386)$(BR2_x86_64),yy)
+HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath
+endif
endif
# libsanitizer requires wordexp, not in default uClibc config. Also
--
2.9.0
next prev parent reply other threads:[~2016-07-01 16:29 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 16:29 [Buildroot] [PATCH v2 00/15] Fortran support for all toolchain Samuel Martin
2016-07-01 16:29 ` Samuel Martin [this message]
2016-07-01 18:19 ` [Buildroot] [PATCH v2 01/15] package/gcc: fix fortran support Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 02/15] package/gcc: wrap gfortran Samuel Martin
2016-07-01 20:55 ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 03/15] package/Makefile.in: set TARGET_FCFLAGS variables Samuel Martin
2016-07-01 20:59 ` Thomas Petazzoni
2016-07-02 11:14 ` Arnout Vandecappelle
2016-07-01 16:29 ` [Buildroot] [PATCH v2 04/15] package/Makefile.in: set variables for legacy f77 checks Samuel Martin
2016-07-01 21:01 ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 05/15] pkg-cmake.mk: export the fortran compiler path in the CMake toolchain file Samuel Martin
2016-07-01 21:02 ` Thomas Petazzoni
2016-07-01 21:37 ` Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 06/15] toolchain: add hidden symbol for fortran support in the toolchain Samuel Martin
2016-07-01 21:03 ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 07/15] package/gcc: select BR2_TOOLCHAIN_HAS_FORTRAN when appropriated Samuel Martin
2016-07-01 21:03 ` Thomas Petazzoni
2016-07-01 21:03 ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 08/15] package/gcc: used BR2_TOOLCHAIN_HAS_FORTRAN instead of BR2_TOOLCHAIN_BUILDROOT_FORTRAN Samuel Martin
2016-07-01 21:06 ` Thomas Petazzoni
2016-07-02 11:18 ` Arnout Vandecappelle
2016-07-01 16:29 ` [Buildroot] [PATCH v2 09/15] toolchain/helpers: add fortran check Samuel Martin
2016-07-01 21:19 ` Thomas Petazzoni
2016-07-01 16:29 ` [Buildroot] [PATCH v2 10/15] toolchain/toolchain-external: enable fortran check when it is selected Samuel Martin
2016-07-01 21:20 ` Thomas Petazzoni
2016-07-02 8:36 ` Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 11/15] toolchain/toolchain-external: add libgfortran and libquadmath to the TOOLCHAIN_EXTERNAL_LIBS list Samuel Martin
2016-07-01 21:22 ` Thomas Petazzoni
2016-07-02 11:22 ` Arnout Vandecappelle
2016-07-01 16:29 ` [Buildroot] [PATCH v2 12/15] toolchain/toolchain-external: add knob for fortran support Samuel Martin
2016-07-01 21:23 ` Thomas Petazzoni
2016-07-02 10:37 ` Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 13/15] toolchain/toolchain-external: update external toolchain configuration with BR2_TOOLCHAIN_HAS_FORTRAN Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 14/15] package/fftw: add fortran support Samuel Martin
2016-07-01 16:29 ` [Buildroot] [PATCH v2 15/15] package/lapack: new package Samuel Martin
2016-07-01 21:26 ` Thomas Petazzoni
2016-07-02 9:45 ` Samuel Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160701162920.19632-2-s.martin49@gmail.com \
--to=s.martin49@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox