diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-05-07 21:23:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-05-08 16:45:13 +0200 |
| commit | 7e1ff1cee5dd203df679d584512930fb21b97f6e (patch) | |
| tree | 520811d8cafa30718399381e5c886195dd4aef84 /external | |
| parent | 9974ed792a1141fe3c3dc0a1ec5255a23e76f27b (diff) | |
external/firebird: Implicit int in configure check
...so that with Clang 15 trunk after
<https://github.com/llvm/llvm-project/commit/2cb2cd242ca08d0bbd2a51a41f1317442e5414fc>
"Change the behavior of implicit int diagnostics" the check now failed to
compile with
> configure:21471: checking alignment of long
[...]
> conftest.c:166:2: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
with consequences the same as in f6be6cd82bd84f13d2a597ceb62181111ae0eb80
"external/firebird: Missing include in configure check" (so rename the existing
configure-include.patch, as it now covers various kinds of C99 violations)
Change-Id: I64e7c13945a3ede3900cc6a84da575e35bdce953
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133994
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 2 | ||||
| -rw-r--r-- | external/firebird/configure-c99.patch (renamed from external/firebird/configure-include.patch) | 13 | ||||
| -rw-r--r-- | external/firebird/firebird-cygwin-msvc.patch | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index e86276e6744a..0233ce24dbf4 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -49,7 +49,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/msvc.patch \ external/firebird/wnt-per-process-trace-storage.patch.1 \ external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \ - external/firebird/configure-include.patch \ + external/firebird/configure-c99.patch \ )) ifeq ($(OS),WNT) diff --git a/external/firebird/configure-include.patch b/external/firebird/configure-c99.patch index fe2935f139d7..f582d383e5f0 100644 --- a/external/firebird/configure-include.patch +++ b/external/firebird/configure-c99.patch @@ -1,18 +1,23 @@ --- configure +++ configure -@@ -21478,6 +21478,7 @@ +@@ -21478,8 +21478,9 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <stdlib.h> #include <semaphore.h> - main () { +-main () { ++int main () { struct s { -@@ -21514,6 +21515,7 @@ + char a; + union { long long x; sem_t y; } b; +@@ -21514,7 +21515,8 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +-main () { +#include <stdlib.h> - main () { ++int main () { struct s { char a; + double b; diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch index a19a2798f405..c59c614ba5da 100644 --- a/external/firebird/firebird-cygwin-msvc.patch +++ b/external/firebird/firebird-cygwin-msvc.patch @@ -34,7 +34,7 @@ /* end confdefs.h. */ #include <stdlib.h> -#include <semaphore.h> - main () { + int main () { struct s { char a; - union { long long x; sem_t y; } b; |