diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-07-14 18:55:37 -0700 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2017-09-13 17:16:28 -0700 |
| commit | 797d1540589a7d237874f9bbc2686abcece9d400 (patch) | |
| tree | c123836af635d7d3ab1a49485c91f13063545cc9 | |
| parent | 4883486d70047ed189ddda5f5646e2cbad77b7d1 (diff) | |
| download | meta-openembedded-797d1540589a7d237874f9bbc2686abcece9d400.tar.gz | |
metacity: Fix build with musl by defining _GNU_SOURCE
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 83814ebd809f2686a5580bf4e73e31a6607c9340)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch | 27 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb | 5 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch new file mode 100644 index 0000000000..539d756b3e --- /dev/null +++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Define-_GNU_SOURCE.patch @@ -0,0 +1,27 @@ +From e7fd072f0df968f342878b77098e97ff07ed28d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 14 Jul 2017 10:26:31 -0700 +Subject: [PATCH] ui: Define _GNU_SOURCE + +it becomes portable across musl and glibc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ui/theme.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ui/theme.c b/src/ui/theme.c +index 84b57a0..c7eafc8 100644 +--- a/src/ui/theme.c ++++ b/src/ui/theme.c +@@ -60,6 +60,7 @@ + #include <gtk/gtk.h> + #include <string.h> + #include <stdlib.h> ++#define _GNU_SOURCE + #define __USE_XOPEN + #include <math.h> + +-- +2.13.3 + diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb index 662c90db86..370de70008 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb @@ -13,7 +13,10 @@ REQUIRED_DISTRO_FEATURES = "x11" GNOME_COMPRESS_TYPE = "xz" -SRC_URI += "file://remove-yelp-help-rules-var.patch" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ + file://remove-yelp-help-rules-var.patch \ + file://0001-ui-Define-_GNU_SOURCE.patch \ + " SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6" SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075" |