[Buildroot] [git commit] package/libglib2: fix 0003-remove-cpp-requirement.patch
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Sun Dec 8 21:46:45 UTC 2019
commit: https://git.buildroot.net/buildroot/commit/?id=97110b578ff1ed62018e0feb4c386d7ebee469cd
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This patch was missing the following section:
@@ -1,4 +1,4 @@
-project('glib', 'c', 'cpp',
+project('glib', 'c',
version : '2.62.3',
# NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
meson_version : '>= 0.49.2',
As such, the package still depended on g++.
Update the patch to add the above section.
Signed-off-by: Adam Duskett <Aduskett at gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
package/libglib2/0003-remove-cpp-requirement.patch | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/package/libglib2/0003-remove-cpp-requirement.patch b/package/libglib2/0003-remove-cpp-requirement.patch
index a96a94043c..80c6c80236 100644
--- a/package/libglib2/0003-remove-cpp-requirement.patch
+++ b/package/libglib2/0003-remove-cpp-requirement.patch
@@ -12,9 +12,9 @@ Upstream status: Denied (Buildroot specific)
https://gitlab.gnome.org/GNOME/glib/issues/1748
---
glib/glibconfig.h.in | 1 -
- meson.build | 16 ----------------
+ meson.build | 18 +-----------------
tests/meson.build | 5 -----
- 3 files changed, 22 deletions(-)
+ 3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
index 7ef8c48..128e65d 100644
@@ -29,9 +29,15 @@ index 7ef8c48..128e65d 100644
/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
* is passed ISO vararg support is turned off, and there is no work
diff --git a/meson.build b/meson.build
-index 83774d0..99806d0 100644
+index 4bbf4c2..ac59f4e 100644
--- a/meson.build
+++ b/meson.build
+@@ -1,4 +1,4 @@
+-project('glib', 'c', 'cpp',
++project('glib', 'c',
+ version : '2.62.3',
+ # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
+ meson_version : '>= 0.49.2',
@@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
)
More information about the buildroot
mailing list