diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2017-05-05 23:24:45 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:25:24 -0500 |
| commit | b3ab41e9b55aa7650fc3047c1c866b7ba61645a5 (patch) | |
| tree | 28f7c708a62d45e5c39dbb4edd21c6fa3f7bb8b7 | |
| parent | 7e8d8e227167f78a083e00caeb7fd96c8063a237 (diff) | |
office/gnokii: Patch for gcc >= 7.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | office/gnokii/gnokii-0.6.31-gcc7.patch | 17 | ||||
| -rw-r--r-- | office/gnokii/gnokii.SlackBuild | 3 |
2 files changed, 20 insertions, 0 deletions
diff --git a/office/gnokii/gnokii-0.6.31-gcc7.patch b/office/gnokii/gnokii-0.6.31-gcc7.patch new file mode 100644 index 000000000000..6637a6af62c4 --- /dev/null +++ b/office/gnokii/gnokii-0.6.31-gcc7.patch @@ -0,0 +1,17 @@ +Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid +build failures with GCC 7.x as "../common/.libs/libgnokii.so: undefined reference +to `local_atoi'". The "inline" is only a hint that the compiler doesn't complain +about double defined symbols, but does not guarantee that a function is inlined +or that a symbol is generated when needed. + +--- gnokii-0.6.31/common/gsm-filetypes.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/common/gsm-filetypes.c.gcc7 2017-02-12 00:55:39.000000000 +0100 +@@ -1409,7 +1409,7 @@ + #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') + #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) + +-inline int local_atoi(char *str, int len) ++static int local_atoi(char *str, int len) + { + int retval; + char *aux = strndup(str, len); diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild index eb3b4f1519a4..5301e1c7cf3f 100644 --- a/office/gnokii/gnokii.SlackBuild +++ b/office/gnokii/gnokii.SlackBuild @@ -73,6 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thnx to fedora for this patch +patch -p1 < $CWD/gnokii-0.6.31-gcc7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |