diff options
| author |   Craig Andrews <candrews@gentoo.org> | 2018-05-15 12:24:10 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@gentoo.org> | 2018-05-17 13:30:32 -0400 |
| commit | ab5303b4ea459e7a829d36fe3198c7e350953e8d (patch) | |
| tree | 6defb5d824bcd325c0c9683ba8042d56bc0424ec /app-emulation/containerd/files | |
| parent | dev-python/protobuf-python: arm stable wrt bug #654428 (diff) | |
| download | gentoo-ab5303b4ea459e7a829d36fe3198c7e350953e8d.tar.gz gentoo-ab5303b4ea459e7a829d36fe3198c7e350953e8d.tar.bz2 gentoo-ab5303b4ea459e7a829d36fe3198c7e350953e8d.zip | |
app-emulation/containerd: Fix "overflows _Ctype_ulonglong" error with GCC 8
Closes: https://bugs.gentoo.org/655804
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'app-emulation/containerd/files')
| -rw-r--r-- | app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch new file mode 100644 index 000000000000..f08fab6e592d --- /dev/null +++ b/app-emulation/containerd/files/containerd-1.0.3_p20180223-remove-c-constant-redefinitions.patch @@ -0,0 +1,38 @@ +From 9686d822284aa8fc9d4d136cc01314f5bf455cba Mon Sep 17 00:00:00 2001 +From: Stephen J Day <stephen.day@docker.com> +Date: Fri, 2 Mar 2018 13:23:31 -0800 +Subject: [PATCH] btrfs: remove C constant redefinitions + +Signed-off-by: Stephen J Day <stephen.day@docker.com> +--- + btrfs.go | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/vendor/github.com/containerd/btrfs/btrfs.go b/vendor/github.com/containerd/btrfs/btrfs.go +index 1deab47..efdf528 100644 +--- a/vendor/github.com/containerd/btrfs/btrfs.go ++++ b/vendor/github.com/containerd/btrfs/btrfs.go +@@ -7,10 +7,6 @@ import "sort" + #include <btrfs/ioctl.h> + #include "btrfs.h" + +-// Required because Go has struct casting rules for negative numbers +-const __u64 u64_BTRFS_LAST_FREE_OBJECTID = (__u64)BTRFS_LAST_FREE_OBJECTID; +-const __u64 negative_one = (__u64)-1; +- + static char* get_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct) { + return btrfs_struct->name; + } +@@ -100,9 +96,9 @@ func subvolMap(path string) (map[uint64]*Info, error) { + args.key.min_type = C.BTRFS_ROOT_ITEM_KEY + args.key.max_type = C.BTRFS_ROOT_BACKREF_KEY + args.key.min_objectid = C.BTRFS_FS_TREE_OBJECTID +- args.key.max_objectid = C.u64_BTRFS_LAST_FREE_OBJECTID +- args.key.max_offset = C.negative_one +- args.key.max_transid = C.negative_one ++ args.key.max_objectid = C.BTRFS_LAST_FREE_OBJECTID ++ args.key.max_offset = ^C.__u64(0) ++ args.key.max_transid = ^C.__u64(0) + + subvolsByID := make(map[uint64]*Info) + |