Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions ports/libsystemd/fix-2604-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
diff --git a/meson.build b/meson.build
index a4730f0570..1034ce5fbc 100644
--- a/meson.build
+++ b/meson.build
@@ -370,21 +370,6 @@ possible_common_cc_flags = [
'-Warray-bounds=2',
'-Wdate-time',
'-Wendif-labels',
- '-Werror=format=2',
- '-Werror=format-signedness',
- '-Werror=implicit-function-declaration',
- '-Werror=implicit-int',
- '-Werror=incompatible-pointer-types',
- '-Werror=int-conversion',
- '-Werror=missing-declarations',
- '-Werror=missing-prototypes',
- '-Werror=overflow',
- '-Werror=override-init',
- '-Werror=return-type',
- '-Werror=shift-count-overflow',
- '-Werror=shift-overflow=2',
- '-Werror=strict-flex-arrays',
- '-Werror=undef',
'-Wfloat-equal',
# gperf prevents us from enabling this because it does not emit fallthrough
# attribute with clang.
@@ -511,19 +496,6 @@ userspace_c_ld_args += cc.get_supported_link_arguments(possible_link_flags)
have = cc.has_argument('-Wzero-length-bounds')
conf.set10('HAVE_ZERO_LENGTH_BOUNDS', have)

-if cc.compiles('''
- #include <time.h>
- #include <inttypes.h>
- typedef uint64_t usec_t;
- usec_t now(clockid_t clock);
- int main(void) {
- struct timespec now;
- return 0;
- }
-''', args: '-Werror=shadow', name : '-Werror=shadow with local shadowing')
- add_project_arguments('-Werror=shadow', language : 'c')
-endif
-
if cxx_cmd != ''
add_project_arguments(cxx.get_supported_arguments(basic_disabled_warnings), language : 'cpp')
endif
1 change: 1 addition & 0 deletions ports/libsystemd/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ vcpkg_from_github(
disable-warning-nonnull.patch
only-libsystemd.patch
pkgconfig.patch
fix-2604-build.patch
)

set(static false)
Expand Down
2 changes: 1 addition & 1 deletion ports/libsystemd/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libsystemd",
"version": "257.8",
"port-version": 1,
"port-version": 2,
"description": "Libsystemd",
"homepage": "https://github.com/systemd/systemd",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5678,7 +5678,7 @@
},
"libsystemd": {
"baseline": "257.8",
"port-version": 1
"port-version": 2
},
"libtar": {
"baseline": "1.2.20",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libsystemd.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2c321fd60481e2ac3996b56c88cd1e6bec5b051e",
"version": "257.8",
"port-version": 2
},
{
"git-tree": "9a7380e250b16232a48738c3e0798f07006c24c8",
"version": "257.8",
Expand Down
Loading