Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7b6857ef91bff901671286b92662772e89de030a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7b6857ef91bff901671286b92662772e89de030a)
  • Date: Mon, 8 Aug 2022 00:02:22 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/glib/HISTORY | 5 +
libs/glib/PRE_BUILD | 3
libs/glib/config.sub.patch | 12 ---
libs/glib/gcc.diff | 11 --
libs/glib/patches/0001-Fix-function-inlining-with-newer-GCC.patch | 38
++++++++++
libs/glib/patches/config.sub.patch | 12 +++
libs/glib/patches/gcc.patch | 11 ++
7 files changed, 67 insertions(+), 25 deletions(-)

New commits:
commit 7b6857ef91bff901671286b92662772e89de030a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

glib: Convert patches to -p1

commit c2710f4c20f445f7ee7880d5c26470b1c1951b23
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

glib: Fix function inlining with newer GCC

diff --git a/libs/glib/HISTORY b/libs/glib/HISTORY
index 82cc1ca..fd79142 100644
--- a/libs/glib/HISTORY
+++ b/libs/glib/HISTORY
@@ -1,3 +1,8 @@
+2022-08-08 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-Fix-function-inlining-with-newer-GCC.patch:
+ Fixed glib.h header for newer GCC
+ * patches/config.sub.patch, patches/gcc.patch: Converted patches to
-p1
+
2020-12-19 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, PRE_BUILD: Moved patching to PRE_BUILD
* PRE_BUILD: Added fix for poll.h include
diff --git a/libs/glib/PRE_BUILD b/libs/glib/PRE_BUILD
index cd6c9c3..28738af 100755
--- a/libs/glib/PRE_BUILD
+++ b/libs/glib/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < $SPELL_DIRECTORY/gcc.diff &&
-patch -p0 < $SPELL_DIRECTORY/config.sub.patch &&
+apply_patch_dir patches &&
sedit '/^#include "glib\.h"/a#include <poll.h>' gmain.c
diff --git a/libs/glib/config.sub.patch b/libs/glib/config.sub.patch
deleted file mode 100644
index c3569a1..0000000
--- a/libs/glib/config.sub.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.sub.old 2000-02-02 16:53:22.000000000 -0800
-+++ config.sub 2005-04-04 23:12:05.000000000 -0700
-@@ -632,6 +631,9 @@
- pentiumii-* | pentium2-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ x86_64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pn)
- basic_machine=pn-gould
- ;;
diff --git a/libs/glib/gcc.diff b/libs/glib/gcc.diff
deleted file mode 100644
index 26cc766..0000000
--- a/libs/glib/gcc.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib.h 2004-05-23 16:13:42.707743928 +0200
-+++ glib.h.cp 2004-05-23 16:15:39.960918736 +0200
-@@ -272,7 +272,7 @@
- /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
- * macros, so we can refer to them as strings unconditionally.
- */
--#ifdef __GNUC__
-+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #define G_GNUC_FUNCTION __FUNCTION__
- #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
- #else /* !__GNUC__ */
diff --git
a/libs/glib/patches/0001-Fix-function-inlining-with-newer-GCC.patch
b/libs/glib/patches/0001-Fix-function-inlining-with-newer-GCC.patch
new file mode 100644
index 0000000..1ec62cf
--- /dev/null
+++ b/libs/glib/patches/0001-Fix-function-inlining-with-newer-GCC.patch
@@ -0,0 +1,38 @@
+From df1173155585281dc58d054c3d0905a6241a0531 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sun, 7 Aug 2022 23:58:29 +0200
+Subject: [PATCH] Fix function inlining with newer GCC
+
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ glib.h | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/glib.h b/glib.h
+index b83cf5db3504..f3c36b0cc13c 100644
+--- a/glib.h
++++ b/glib.h
+@@ -202,20 +202,11 @@ extern "C" {
+ # endif
+ #endif
+ #ifndef G_INLINE_FUNC
+-# ifdef __GNUC__
+-# ifdef __OPTIMIZE__
+-# define G_INLINE_FUNC extern inline
+-# else
+-# undef G_CAN_INLINE
+-# define G_INLINE_FUNC extern
+-# endif
+-# else /* !__GNUC__ */
+ # ifdef G_CAN_INLINE
+ # define G_INLINE_FUNC static inline
+ # else
+ # define G_INLINE_FUNC extern
+ # endif
+-# endif /* !__GNUC__ */
+ #endif /* !G_INLINE_FUNC */
+
+
+--
+2.37.1
+
diff --git a/libs/glib/patches/config.sub.patch
b/libs/glib/patches/config.sub.patch
new file mode 100644
index 0000000..6094495
--- /dev/null
+++ b/libs/glib/patches/config.sub.patch
@@ -0,0 +1,12 @@
+--- a/config.sub
++++ b/config.sub
+@@ -632,6 +631,9 @@
+ pentiumii-* | pentium2-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
++ x86_64-*)
++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
diff --git a/libs/glib/patches/gcc.patch b/libs/glib/patches/gcc.patch
new file mode 100644
index 0000000..825b4c6
--- /dev/null
+++ b/libs/glib/patches/gcc.patch
@@ -0,0 +1,11 @@
+--- a/glib.h
++++ b/glib.h
+@@ -272,7 +272,7 @@
+ /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+ * macros, so we can refer to them as strings unconditionally.
+ */
+-#ifdef __GNUC__
++#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+ #define G_GNUC_FUNCTION __FUNCTION__
+ #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
+ #else /* !__GNUC__ */



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (7b6857ef91bff901671286b92662772e89de030a), Ismael Luceno, 08/07/2022

Archive powered by MHonArc 2.6.24.

Top of Page