diff options
| author | Florian Franzmann | 2020-07-05 13:35:06 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2020-07-05 13:35:06 +0200 |
| commit | 7fc03d876a7b1276f3d131f011e25fbf85ed08ea (patch) | |
| tree | 8961084c534f8771d10da767d5b09c3a45ee8808 /smgl | |
| parent | 815174bde2826c2a83257097fc85fbaee81f849b (diff) | |
smgl/castfs: fix linking error
Diffstat (limited to 'smgl')
| -rw-r--r-- | smgl/castfs/0001-Fix-linker-error-due-to-global-symbols.patch | 56 | ||||
| -rw-r--r-- | smgl/castfs/HISTORY | 4 | ||||
| -rwxr-xr-x | smgl/castfs/PRE_BUILD | 1 |
3 files changed, 61 insertions, 0 deletions
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 0000000000..873e204f16 --- /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@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 4971c5dccb..c028370850 100644 --- a/smgl/castfs/HISTORY +++ b/smgl/castfs/HISTORY @@ -1,3 +1,7 @@ +2020-07-05 Florian Franzmann <siflfran@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@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 e89ef15735..c6f57c20cc 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 |