diff options
| author | Matt Weber <matthew.weber@rockwellcollins.com> | 2017-10-31 01:18:34 -0500 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-11-01 15:51:25 +0100 |
| commit | f0b65bd90ce4429d6b7e952ce7de2d5f92a2dd26 (patch) | |
| tree | 39af1f46c94a1bf9670cc481a70365267ec4556a | |
| parent | 080b082691a18196670a0a85acebf27f4b26b2e0 (diff) | |
| download | buildroot-f0b65bd90ce4429d6b7e952ce7de2d5f92a2dd26.tar.gz buildroot-f0b65bd90ce4429d6b7e952ce7de2d5f92a2dd26.zip | |
argp-standalone: fix build with gcc 7.x
Back in commit a662ff7e79630ca0875dd8529fe54db27a275007
("package/argp-standalone: Fix build with c99 compilers"), we fixed
the build of argp-standalone with compilers defaulting to C99 inline
semantics, i.e starting from gcc 5.x.
This was done as part of a patch that used "inline" instead of "extern
inline". However, using "inline" once again broke the build with gcc
7.x. To fix this, revert back to using just "extern inline" (hence
removing a patch of patch 0003-fix_build_with_c99_compilers.patch) and
instead use -fgnu89-inline in the CFLAGS.
See https://gcc.gnu.org/gcc-5/porting_to.html for more details.
Fixes:
http://autobuild.buildroot.net/results/a9cedc54829b7bd2dd7ae6ff2bd6c6db242f1c35/
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
[Thomas: also drop the patch of
0003-fix_build_with_c99_compilers.patch that is no longer needed.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/argp-standalone/0003-fix_build_with_c99_compilers.patch | 12 | ||||
| -rw-r--r-- | package/argp-standalone/argp-standalone.mk | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/package/argp-standalone/0003-fix_build_with_c99_compilers.patch b/package/argp-standalone/0003-fix_build_with_c99_compilers.patch index bfa0bb53e1..56b753b607 100644 --- a/package/argp-standalone/0003-fix_build_with_c99_compilers.patch +++ b/package/argp-standalone/0003-fix_build_with_c99_compilers.patch @@ -66,15 +66,3 @@ index e797b11..828f435 100644 /* Internal routines. */ extern void _argp_fmtstream_update (argp_fmtstream_t __fs); -@@ -216,7 +220,11 @@ - #endif - - #ifndef ARGP_FS_EI -+#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) - #define ARGP_FS_EI extern inline -+#else -+#define ARGP_FS_EI inline -+#endif - #endif - - ARGP_FS_EI size_t diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk index 7a7028cc1f..977b9547b6 100644 --- a/package/argp-standalone/argp-standalone.mk +++ b/package/argp-standalone/argp-standalone.mk @@ -10,7 +10,7 @@ ARGP_STANDALONE_INSTALL_STAGING = YES ARGP_STANDALONE_LICENSE = LGPL-2.0+ ARGP_STANDALONE_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" + CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline" define ARGP_STANDALONE_INSTALL_STAGING_CMDS $(INSTALL) -D $(@D)/libargp.a $(STAGING_DIR)/usr/lib/libargp.a |
