Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7fc03d876a7b1276f3d131f011e25fbf85ed08ea)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7fc03d876a7b1276f3d131f011e25fbf85ed08ea)
  • Date: Sun, 5 Jul 2020 11:35:15 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

smgl/castfs/0001-Fix-linker-error-due-to-global-symbols.patch | 56
++++++++++
smgl/castfs/HISTORY | 4
smgl/castfs/PRE_BUILD | 1
xorg-driver/xf86-video-nouveau/BUILD | 3
xorg-driver/xf86-video-nouveau/HISTORY | 3
5 files changed, 67 insertions(+)

New commits:
commit 7fc03d876a7b1276f3d131f011e25fbf85ed08ea
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

smgl/castfs: fix linking error

commit 815174bde2826c2a83257097fc85fbaee81f849b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

xorg-driver/xf86-video-nouveau: disable incompatible compiler flags

diff --git a/smgl/castfs/0001-Fix-linker-error-due-to-global-symbols.patch
b/smgl/castfs/0001-Fix-linker-error-due-to-global-symbols.patch
new file mode 100644
index 0000000..873e204
--- /dev/null
+++ b/smgl/castfs/0001-Fix-linker-error-due-to-global-symbols.patch
@@ -0,0 +1,56 @@
+From bc70cafd3bbb50cbbca51575e0bdf196b323d5b1 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 5 Jul 2020 13:32:55 +0200
+Subject: [PATCH] Fix linker error due to global symbols
+
+---
+ include/castfs.h | 12 ++++++------
+ src/castfs.c | 8 ++++++++
+ 2 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/include/castfs.h b/include/castfs.h
+index 3d78ff0..661ba5a 100644
+--- a/include/castfs.h
++++ b/include/castfs.h
+@@ -38,13 +38,13 @@ struct st_cast_path
+ typedef struct st_cast_path cast_paths;
+ typedef cast_paths* cast_paths_ptr;
+
+-int logfd;
+-int dbglvl;
++extern int logfd;
++extern int dbglvl;
+
+-char *mount_path;
+-char *stage_path;
+-char **ignored_dirs;
+-int ignored_dirs_len;
++extern char *mount_path;
++extern char *stage_path;
++extern char **ignored_dirs;
++extern int ignored_dirs_len;
+
+ void usage(void);
+ int cast_log(unsigned int dbgmask, const char* format,...);
+diff --git a/src/castfs.c b/src/castfs.c
+index a9989a0..3b6b742 100644
+--- a/src/castfs.c
++++ b/src/castfs.c
+@@ -5,6 +5,14 @@
+ #include "castfs.h"
+ #include "hash.h"
+
++int logfd;
++int dbglvl;
++
++char *mount_path;
++char *stage_path;
++char **ignored_dirs;
++int ignored_dirs_len;
++
+ /* getattr(): see man fstat or man lstat */
+ static int cast_getattr(const char *path, struct stat *stbuf)
+ {
+--
+2.27.0
+
diff --git a/smgl/castfs/HISTORY b/smgl/castfs/HISTORY
index 4971c5d..c028370 100644
--- a/smgl/castfs/HISTORY
+++ b/smgl/castfs/HISTORY
@@ -1,3 +1,7 @@
+2020-07-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-Fix-linker-error-due-to-global-symbols.patch:
+ fix linking error, uncovered by gcc 10
+
2019-12-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch: fix
error triggered by -D_FORTIFY_SOURCE=2
diff --git a/smgl/castfs/PRE_BUILD b/smgl/castfs/PRE_BUILD
index e89ef15..c6f57c2 100755
--- a/smgl/castfs/PRE_BUILD
+++ b/smgl/castfs/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p1 <
"$SPELL_DIRECTORY/0001-Fix-error-triggered-by-D_FORTIFY_SOURCE-2.patch" &&
+patch -p1 <
"$SPELL_DIRECTORY/0001-Fix-linker-error-due-to-global-symbols.patch" &&

if [[ $CASTFS_BRANCH == scm ]]; then
./autogen.sh
diff --git a/xorg-driver/xf86-video-nouveau/BUILD
b/xorg-driver/xf86-video-nouveau/BUILD
new file mode 100755
index 0000000..cd07bf3
--- /dev/null
+++ b/xorg-driver/xf86-video-nouveau/BUILD
@@ -0,0 +1,3 @@
+disable_no_plt &&
+disable_z_now &&
+default_build
diff --git a/xorg-driver/xf86-video-nouveau/HISTORY
b/xorg-driver/xf86-video-nouveau/HISTORY
index dbb7593..7ba48f0 100644
--- a/xorg-driver/xf86-video-nouveau/HISTORY
+++ b/xorg-driver/xf86-video-nouveau/HISTORY
@@ -1,3 +1,6 @@
+2020-07-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: disable -fno-plt, -Wl,-z,now
+
2019-01-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.16




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (7fc03d876a7b1276f3d131f011e25fbf85ed08ea), Florian Franzmann, 07/05/2020

Archive powered by MHonArc 2.6.24.

Top of Page