[med-svn] [Git][med-team/loki][master] Fix gcc-14 build issue

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / loki


Commits:
2f5ea1a1 by Andreas Tille at 2024-12-19T17:56:18+01:00
Fix gcc-14 build issue

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gcc-4.1.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+loki (2.4.7.4-12) UNRELEASED; urgency=medium
+
+  * Fix gcc-14 build issue
+    Closes: #1090794
+
+ -- Andreas Tille <tille at debian.org>  Thu, 19 Dec 2024 17:09:00 +0100
+
 loki (2.4.7.4-11) unstable; urgency=medium
 
   * Team Upload


=====================================
debian/patches/gcc-4.1.patch
=====================================
@@ -0,0 +1,29 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: 2024-12-19
+Bug-Debian: https://bugs.debian.org/1090794
+Description: Fix gcc-14 build issue
+
+--- a/include/utils.h
++++ b/include/utils.h
+@@ -28,8 +28,8 @@ typedef struct {
+ 	double extra_time,extra_stime,extra_utime;
+ } loki_time;
+ 
+-const char *FMsg,*IntErr,*MMsg,*AbMsg;
+-int from_abt;
++extern const char *FMsg,*IntErr,*MMsg,*AbMsg;
++extern int from_abt;
+ 
+ void abt(const char *, const int, const char *, ...);
+ char *copy_string(const char *);
+--- a/prepsrc/compat/merlin.c
++++ b/prepsrc/compat/merlin.c
+@@ -38,7 +38,7 @@
+ 
+ #define BUFSIZE 512
+ 
+-int strip_vars;
++extern int strip_vars;
+ 
+ char *skip_blank(char *s)
+ {


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 10_lex.patch
 hardening.patch
 spelling.patch
+gcc-4.1.patch



View it on GitLab: https://salsa.debian.org/med-team/loki/-/commit/2f5ea1a1a9e7db9884f0b3586b8da54856bfc077

-- 
View it on GitLab: https://salsa.debian.org/med-team/loki/-/commit/2f5ea1a1a9e7db9884f0b3586b8da54856bfc077
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20241219/7e02f783/attachment-0001.htm>