diff options
| author | Daniel Bertalan <dani@danielbertalan.dev> | 2021-12-23 09:51:49 +0100 |
|---|---|---|
| committer | Ali Mohammad Pur <Ali.mpfard@gmail.com> | 2021-12-24 17:01:10 +0330 |
| commit | e539a1d077c0e8a240e3997f8734a1c696ec8d7b (patch) | |
| tree | 872e045dd33d2156ff523a676dd1b607d1610dda | |
| parent | f7b399da442f03822da7d61a02bf2f879ad6d417 (diff) | |
| download | serenity-e539a1d077c0e8a240e3997f8734a1c696ec8d7b.zip | |
Ports/cmake: Remove obsolete conflicting declaration patches
I'm not quite sure why, but CMake compiles fine without these.
| -rw-r--r-- | Ports/cmake/patches/0016-conflicting-0.patch | 12 | ||||
| -rw-r--r-- | Ports/cmake/patches/0017-conflicting-1.patch | 12 | ||||
| -rw-r--r-- | Ports/cmake/patches/ReadMe.md | 10 |
3 files changed, 0 insertions, 34 deletions
diff --git a/Ports/cmake/patches/0016-conflicting-0.patch b/Ports/cmake/patches/0016-conflicting-0.patch deleted file mode 100644 index 09c1cb9b1e..0000000000 --- a/Ports/cmake/patches/0016-conflicting-0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Utilities/cmnghttp2/cmakeconfig.h.in 2021-02-12 22:10:29.813759193 +0330 -+++ b/Utilities/cmnghttp2/cmakeconfig.h.in 2021-02-12 22:10:35.577912239 +0330 -@@ -5,9 +5,6 @@ - #include <cm3p/kwiml/abi.h> - #include <cm3p/kwiml/int.h> - --/* Define to `int' if <sys/types.h> does not define. */ --#cmakedefine ssize_t @ssize_t@ -- - /* sizeof(int *) */ - #define SIZEOF_INT_P KWIML_ABI_SIZEOF_DATA_PTR - diff --git a/Ports/cmake/patches/0017-conflicting-1.patch b/Ports/cmake/patches/0017-conflicting-1.patch deleted file mode 100644 index 0f09327a00..0000000000 --- a/Ports/cmake/patches/0017-conflicting-1.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Utilities/cmcurl/lib/curl_config.h.cmake 2021-02-12 22:12:54.848790862 +0330 -+++ b/Utilities/cmcurl/lib/curl_config.h.cmake 2021-02-12 22:12:57.841458768 +0330 -@@ -1052,9 +1052,6 @@ ${SIZEOF_TIME_T_CODE} - /* Define to empty if `const' does not conform to ANSI C. */ - #cmakedefine const ${const} - --/* Type to use in place of in_addr_t when system does not provide it. */ --#cmakedefine in_addr_t ${in_addr_t} -- - /* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ - #ifndef __cplusplus diff --git a/Ports/cmake/patches/ReadMe.md b/Ports/cmake/patches/ReadMe.md index 9018ea2e6b..c072305c00 100644 --- a/Ports/cmake/patches/ReadMe.md +++ b/Ports/cmake/patches/ReadMe.md @@ -59,16 +59,6 @@ Everyone gets this wrong. most platforms are very lax with these includes, but w - [ ] Resolves issue(s) with our side of things - [ ] Hack -## `0016-conflicting-0.patch` and `0017-conflicting-1.patch` - -These two defines make GCC very sad. reasons are unknown at this time. - -### Status -- [ ] Local? -- [ ] Should be merged to upstream? -- [X] Resolves issue(s) with our side of things -- [X] Hack - ## `0026-curl-struct-stat.patch` For unknown reasons, `curl_setup_once.h` does not include `sys/stat.h`. this patch includes `sys/stat.h`. |