Skip to contentSkip to conversation

package/efl: fix build with gcc < 5.0

PATCH New Romain Naour 2 participants 3 messages Apr 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/efl: fix build with gcc < 5.0

__has_attribute has been introduced with gcc 5 [1].

[1] https://www.gnu.org/software/gcc/gcc-5/changes.html

Fixes:
http://autobuild.buildroot.net/results/64ab825048fac1654b0d0698740ddf857fcc0afa/

---
 ...-add-missing-__has_attribute-definitions-.patch | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 package/efl/0001-libunibreak-add-missing-__has_attribute-definitions-.patch
package/efl/0001-libunibreak-add-missing-__has_attribute-definitions-.patch new file +48 -0
new file mode 100644
index 0000000000..3b70d15293
@@ -0,0 +1,48 @@
+From c394fba4c4c820ea2b7200306ff033e4bbc12ead Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Mon, 22 Apr 2019 19:26:09 +0200
+Subject: [PATCH] libunibreak: add missing __has_attribute definitions for old
+ compilers
+
+__has_attribute has been introduced with gcc 5 [1].
+
+[1] https://www.gnu.org/software/gcc/gcc-5/changes.html
+
+Fixes:
+http://autobuild.buildroot.net/results/64ab825048fac1654b0d0698740ddf857fcc0afa/build-end.log
+
+Upstream status:
+https://phab.enlightenment.org/T7818
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ src/static_libs/libunibreak/wordbreak.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/static_libs/libunibreak/wordbreak.c b/src/static_libs/libunibreak/wordbreak.c
+index 017e0fd091..50c830c7cc 100644
+--- a/src/static_libs/libunibreak/wordbreak.c
++++ b/src/static_libs/libunibreak/wordbreak.c
+@@ -209,6 +209,9 @@ static void set_wordbreaks(
+                 posLast = posCur;
+                 break;
+             }
++#ifndef __has_attribute
++# define __has_attribute(x) 0
++#endif
+ #if __has_attribute(fallthrough)
+            __attribute__((fallthrough));
+ #endif
+@@ -325,6 +328,9 @@ static void set_wordbreaks(
+                 wbcSeqStart = wbcCur;
+                 posLast = posCur;
+             }
++#ifndef __has_attribute
++# define __has_attribute(x) 0
++#endif
+ #if __has_attribute(fallthrough)
+            __attribute__((fallthrough));
+ #endif
+-- 
+2.14.5
+
Signature · 1 line
2.14.5
#1 lore raw

PATCH 2/2 package/efl: bump to version 1.22.1

See:
https://www.enlightenment.org/news/efl-1.22.1

---
 package/efl/efl.hash | 4 ++--
 package/efl/efl.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/efl/efl.hash +2 -2
index 18d867bfe4..bef0a73ff1 100644
@@ -1,5 +1,5 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.0.tar.xz.sha256
-sha256 6ac87450cb55a5948c550dbeb05464f5fc1b0616c52dcb1cb2efbda73999c8ef efl-1.22.0.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.1.tar.xz.sha256
+sha256 20d3e5e945d54ae46ec916c7341b5dec24f904b6c0123b4d3ecb8cd8d596ae12 efl-1.22.1.tar.xz
 
 sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341  COMPLIANCE
 sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37  COPYING
package/efl/efl.mk +1 -1
index ecc31f84c4..959ed0cc3b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EFL_VERSION = 1.22.0
+EFL_VERSION = 1.22.1
 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
 EFL_SITE = http://download.enlightenment.org/rel/libs/efl
 EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
Signature · 1 line
2.14.5
#2 lore raw

PATCH 1/2 package/efl: fix build with gcc < 5.0

In reply to Romain Naour
Quoted 4 lines · On Mon, 22 Apr 2019 19:36:12 +0200 Romain Naour <[email protected]> wrote:

__has_attribute has been introduced with gcc 5 [1].

[1] https://www.gnu.org/software/gcc/gcc-5/changes.html

Quoted 8 lines

Fixes:
http://autobuild.buildroot.net/results/64ab825048fac1654b0d0698740ddf857fcc0afa/

---
 ...-add-missing-__has_attribute-definitions-.patch | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 package/efl/0001-libunibreak-add-missing-__has_attribute-definitions-.patch

Both applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com