From d3c7d3e5f9607edef1a795ccc502ab3eb3121165 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 Nov 2024 03:02:32 +0000 Subject: gentoo auto-resync : 14:11:2024 - 03:02:32 --- dev-ruby/ffi/Manifest | 5 - .../files/add-types.conf-for-hppa2.0-linux.patch | 191 --------------------- dev-ruby/ffi/files/backport-pr-962.patch | 48 ------ dev-ruby/ffi/files/fix-regenerate-types-conf.patch | 23 --- dev-ruby/ffi/files/pr-957-sparc.patch | 42 ----- .../use-libffi-closure-allocations-on-hppa.patch | 21 --- 6 files changed, 330 deletions(-) delete mode 100644 dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch delete mode 100644 dev-ruby/ffi/files/backport-pr-962.patch delete mode 100644 dev-ruby/ffi/files/fix-regenerate-types-conf.patch delete mode 100644 dev-ruby/ffi/files/pr-957-sparc.patch delete mode 100644 dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch (limited to 'dev-ruby/ffi') diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest index 93e64043b232..21cca1d2f419 100644 --- a/dev-ruby/ffi/Manifest +++ b/dev-ruby/ffi/Manifest @@ -1,8 +1,3 @@ -AUX add-types.conf-for-hppa2.0-linux.patch 7837 BLAKE2B 01991d89716c8a4de95ecd57a71b217926ac99e2c252dddd3fa5953ae46a677915fe61a88555302d4c7d213a4749f6069b542487187f4873543b34c8d2b686fb SHA512 1b9c8e026b999b96490af57e2a12895cc2690a108046461f1011ef6a2f3d2594a09bbfecc3020c064af2f7e2242232fae955db63b4001f889d784b15c7ce5130 -AUX backport-pr-962.patch 1773 BLAKE2B b4eb227a949136143a98e8a5ed9067599d3a4ec14376c52619e2f3db56906ed028f9be889aa6eea5abe7e7ca9c3196208ede7dc5768cba43ecf9d000f1e3e1da SHA512 dc6a17bccde42b3a64e7de3bed5fe0818a4bfe9e109b665ccf06963a4939fec2a77e3fcff073cf3a4feccb68d3dc05bbb4885ebe53c2060965e114041c9e3ce5 -AUX fix-regenerate-types-conf.patch 906 BLAKE2B dfeb2257e4cf63de918a194a74ac367bbe5755c6104a1c289adcaf04805623ffcad3ac553b07e063aea468fdc9cb3a904fa86f22b40f22a2a5d68b23aa01baae SHA512 6c6c8518e7bebe55a64ea4469b8649f13c4ac81266a1788ac88229438084a894d222907edcf9aeb28587531e95a33644c58f53890a1b3cbcde181365c4352875 -AUX pr-957-sparc.patch 1681 BLAKE2B e08a03d5e054ce030c04cb0645ed2683faa9d0ec8782313464112e3dd3adf0b8ee40f7fbea9aec15ee7590189e93f03617fe06b506e2ea049535e48bc33a8f23 SHA512 32bd488a3cc4b0c81d8f7f9f2875e591b8de7bf741b838aab3f20ea64025984b3d83c393e1e8f0b628f009b2473d381139655f965cc746dc9074cbe57171cb7d -AUX use-libffi-closure-allocations-on-hppa.patch 761 BLAKE2B a6f460a967752b20ecf9a138b9b7dfa76acd290dae369629af75fe691402ad444bae9d9f27360df38770c018287d2e526c594394a206cf295bd586701f1aa9c8 SHA512 b247a5276f51a66042a235bc6e02a675bb696c6fa600d541c040f6adfaadd458d037db2eecbfff4ddc2d9bd61b0dfb8b90c149bf3181517377d0ccb71ec31161 DIST ffi-git-1.17.0.tgz 192947 BLAKE2B 86340ad6f2768c68f50de28cd5ee10adccee28a93b71136185993025d13fba2b035c6ff212583a941934bb65822ec60ca3d9968f100eec372956a1d030692650 SHA512 70ba69172bdaebc731a3aa1ae8a2959a31ca82d27d1fb9784bb07b51ba8d4912fc1c880fd709e1aad048fc1f70a161d6c4814617ff403d2d94c44758b143db4b EBUILD ffi-1.17.0.ebuild 1706 BLAKE2B f15e4755e9f2d8a70a7b436462a2ea00eecbdf3d5cf5a04e8adddb033169b88f2f580e1a8c0b90879777a4c19a8977a22cae88ea37deb92785e4f79aa853b82a SHA512 49c6a04f9259a80c54209abfe5eec0b0a46b664706d513d5a6c8bd1225e4f5a9676ee95ad7af642d07d0d3cbe70caa8936d6dd5829cd50278bbf1eca4cd54a97 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3 diff --git a/dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch b/dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch deleted file mode 100644 index 2594d2b8359c..000000000000 --- a/dev-ruby/ffi/files/add-types.conf-for-hppa2.0-linux.patch +++ /dev/null @@ -1,191 +0,0 @@ -https://github.com/ffi/ffi/pull/1017 - -From 1f0a4db3d6b16142d2ef547c8dde7a36b21bd39a Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 9 Apr 2023 02:20:32 +0100 -Subject: [PATCH 2/2] Add types.conf for hppa2.0-linux - ---- /dev/null -+++ b/lib/ffi/platform/hppa2.0-linux/types.conf -@@ -0,0 +1,178 @@ -+rbx.platform.typedef.*__caddr_t = char -+rbx.platform.typedef.__blkcnt64_t = long_long -+rbx.platform.typedef.__blkcnt_t = long -+rbx.platform.typedef.__blksize_t = long -+rbx.platform.typedef.__clock_t = long -+rbx.platform.typedef.__clockid_t = int -+rbx.platform.typedef.__daddr_t = int -+rbx.platform.typedef.__dev_t = ulong_long -+rbx.platform.typedef.__fd_mask = long -+rbx.platform.typedef.__fsblkcnt64_t = ulong_long -+rbx.platform.typedef.__fsblkcnt_t = ulong -+rbx.platform.typedef.__fsfilcnt64_t = ulong_long -+rbx.platform.typedef.__fsfilcnt_t = ulong -+rbx.platform.typedef.__fsword_t = int -+rbx.platform.typedef.__gid_t = uint -+rbx.platform.typedef.__id_t = uint -+rbx.platform.typedef.__ino64_t = ulong_long -+rbx.platform.typedef.__ino_t = ulong -+rbx.platform.typedef.__int16_t = short -+rbx.platform.typedef.__int32_t = int -+rbx.platform.typedef.__int64_t = long_long -+rbx.platform.typedef.__int8_t = char -+rbx.platform.typedef.__int_least16_t = short -+rbx.platform.typedef.__int_least32_t = int -+rbx.platform.typedef.__int_least64_t = long_long -+rbx.platform.typedef.__int_least8_t = char -+rbx.platform.typedef.__intmax_t = long_long -+rbx.platform.typedef.__intptr_t = int -+rbx.platform.typedef.__kernel_caddr_t = string -+rbx.platform.typedef.__kernel_clock_t = long -+rbx.platform.typedef.__kernel_clockid_t = int -+rbx.platform.typedef.__kernel_daddr_t = int -+rbx.platform.typedef.__kernel_gid16_t = ushort -+rbx.platform.typedef.__kernel_gid32_t = uint -+rbx.platform.typedef.__kernel_gid_t = uint -+rbx.platform.typedef.__kernel_ino64_t = ulong_long -+rbx.platform.typedef.__kernel_ino_t = ulong -+rbx.platform.typedef.__kernel_ipc_pid_t = ushort -+rbx.platform.typedef.__kernel_key_t = int -+rbx.platform.typedef.__kernel_loff_t = long_long -+rbx.platform.typedef.__kernel_long_t = long -+rbx.platform.typedef.__kernel_mode_t = ushort -+rbx.platform.typedef.__kernel_mqd_t = int -+rbx.platform.typedef.__kernel_off64_t = long_long -+rbx.platform.typedef.__kernel_off_t = long -+rbx.platform.typedef.__kernel_old_dev_t = uint -+rbx.platform.typedef.__kernel_old_gid_t = uint -+rbx.platform.typedef.__kernel_old_time_t = long -+rbx.platform.typedef.__kernel_old_uid_t = uint -+rbx.platform.typedef.__kernel_pid_t = int -+rbx.platform.typedef.__kernel_ptrdiff_t = int -+rbx.platform.typedef.__kernel_size_t = uint -+rbx.platform.typedef.__kernel_ssize_t = int -+rbx.platform.typedef.__kernel_suseconds_t = long -+rbx.platform.typedef.__kernel_time64_t = long_long -+rbx.platform.typedef.__kernel_time_t = long -+rbx.platform.typedef.__kernel_timer_t = int -+rbx.platform.typedef.__kernel_uid16_t = ushort -+rbx.platform.typedef.__kernel_uid32_t = uint -+rbx.platform.typedef.__kernel_uid_t = uint -+rbx.platform.typedef.__kernel_ulong_t = ulong -+rbx.platform.typedef.__key_t = int -+rbx.platform.typedef.__loff_t = long_long -+rbx.platform.typedef.__mode_t = uint -+rbx.platform.typedef.__nlink_t = uint -+rbx.platform.typedef.__off64_t = long_long -+rbx.platform.typedef.__off_t = long -+rbx.platform.typedef.__pid_t = int -+rbx.platform.typedef.__priority_which_t = int -+rbx.platform.typedef.__quad_t = long_long -+rbx.platform.typedef.__rlim64_t = ulong_long -+rbx.platform.typedef.__rlim_t = ulong -+rbx.platform.typedef.__rlimit_resource_t = int -+rbx.platform.typedef.__rusage_who_t = int -+rbx.platform.typedef.__sig_atomic_t = int -+rbx.platform.typedef.__socklen_t = uint -+rbx.platform.typedef.__ssize_t = int -+rbx.platform.typedef.__suseconds64_t = long_long -+rbx.platform.typedef.__suseconds_t = long -+rbx.platform.typedef.__syscall_slong_t = long -+rbx.platform.typedef.__syscall_ulong_t = ulong -+rbx.platform.typedef.__thrd_t = ulong -+rbx.platform.typedef.__time64_t = long_long -+rbx.platform.typedef.__time_t = long -+rbx.platform.typedef.__timer_t = pointer -+rbx.platform.typedef.__tss_t = uint -+rbx.platform.typedef.__u_char = uchar -+rbx.platform.typedef.__u_int = uint -+rbx.platform.typedef.__u_long = ulong -+rbx.platform.typedef.__u_quad_t = ulong_long -+rbx.platform.typedef.__u_short = ushort -+rbx.platform.typedef.__uid_t = uint -+rbx.platform.typedef.__uint16_t = ushort -+rbx.platform.typedef.__uint32_t = uint -+rbx.platform.typedef.__uint64_t = ulong_long -+rbx.platform.typedef.__uint8_t = uchar -+rbx.platform.typedef.__uint_least16_t = ushort -+rbx.platform.typedef.__uint_least32_t = uint -+rbx.platform.typedef.__uint_least64_t = ulong_long -+rbx.platform.typedef.__uint_least8_t = uchar -+rbx.platform.typedef.__uintmax_t = ulong_long -+rbx.platform.typedef.__useconds_t = uint -+rbx.platform.typedef.blkcnt_t = long_long -+rbx.platform.typedef.blksize_t = long -+rbx.platform.typedef.clock_t = long -+rbx.platform.typedef.clockid_t = int -+rbx.platform.typedef.daddr_t = int -+rbx.platform.typedef.dev_t = ulong_long -+rbx.platform.typedef.fd_mask = long -+rbx.platform.typedef.fsblkcnt_t = ulong_long -+rbx.platform.typedef.fsfilcnt_t = ulong_long -+rbx.platform.typedef.gid_t = uint -+rbx.platform.typedef.id_t = uint -+rbx.platform.typedef.in_addr_t = uint -+rbx.platform.typedef.in_port_t = ushort -+rbx.platform.typedef.ino_t = ulong_long -+rbx.platform.typedef.int16_t = short -+rbx.platform.typedef.int32_t = int -+rbx.platform.typedef.int64_t = long_long -+rbx.platform.typedef.int8_t = char -+rbx.platform.typedef.int_fast16_t = int -+rbx.platform.typedef.int_fast32_t = int -+rbx.platform.typedef.int_fast64_t = long_long -+rbx.platform.typedef.int_fast8_t = char -+rbx.platform.typedef.int_least16_t = short -+rbx.platform.typedef.int_least32_t = int -+rbx.platform.typedef.int_least64_t = long_long -+rbx.platform.typedef.int_least8_t = char -+rbx.platform.typedef.intmax_t = long_long -+rbx.platform.typedef.intptr_t = int -+rbx.platform.typedef.key_t = int -+rbx.platform.typedef.loff_t = long_long -+rbx.platform.typedef.mode_t = uint -+rbx.platform.typedef.nlink_t = uint -+rbx.platform.typedef.off_t = long_long -+rbx.platform.typedef.pid_t = int -+rbx.platform.typedef.pthread_key_t = uint -+rbx.platform.typedef.pthread_once_t = int -+rbx.platform.typedef.pthread_t = ulong -+rbx.platform.typedef.ptrdiff_t = int -+rbx.platform.typedef.quad_t = long_long -+rbx.platform.typedef.register_t = long -+rbx.platform.typedef.rlim_t = ulong_long -+rbx.platform.typedef.sa_family_t = ushort -+rbx.platform.typedef.size_t = uint -+rbx.platform.typedef.socklen_t = uint -+rbx.platform.typedef.ssize_t = int -+rbx.platform.typedef.suseconds_t = long -+rbx.platform.typedef.time_t = long -+rbx.platform.typedef.timer_t = pointer -+rbx.platform.typedef.u_char = uchar -+rbx.platform.typedef.u_int = uint -+rbx.platform.typedef.u_int16_t = ushort -+rbx.platform.typedef.u_int32_t = uint -+rbx.platform.typedef.u_int64_t = ulong_long -+rbx.platform.typedef.u_int8_t = uchar -+rbx.platform.typedef.u_long = ulong -+rbx.platform.typedef.u_quad_t = ulong_long -+rbx.platform.typedef.u_short = ushort -+rbx.platform.typedef.uid_t = uint -+rbx.platform.typedef.uint = uint -+rbx.platform.typedef.uint16_t = ushort -+rbx.platform.typedef.uint32_t = uint -+rbx.platform.typedef.uint64_t = ulong_long -+rbx.platform.typedef.uint8_t = uchar -+rbx.platform.typedef.uint_fast16_t = uint -+rbx.platform.typedef.uint_fast32_t = uint -+rbx.platform.typedef.uint_fast64_t = ulong_long -+rbx.platform.typedef.uint_fast8_t = uchar -+rbx.platform.typedef.uint_least16_t = ushort -+rbx.platform.typedef.uint_least32_t = uint -+rbx.platform.typedef.uint_least64_t = ulong_long -+rbx.platform.typedef.uint_least8_t = uchar -+rbx.platform.typedef.uintmax_t = ulong_long -+rbx.platform.typedef.uintptr_t = uint -+rbx.platform.typedef.ulong = ulong -+rbx.platform.typedef.ushort = ushort -+rbx.platform.typedef.wchar_t = long --- -2.40.0 - diff --git a/dev-ruby/ffi/files/backport-pr-962.patch b/dev-ruby/ffi/files/backport-pr-962.patch deleted file mode 100644 index 708c52025bd5..000000000000 --- a/dev-ruby/ffi/files/backport-pr-962.patch +++ /dev/null @@ -1,48 +0,0 @@ -From edc54894f77d00c4ca34593c8b4c94f656f5807e Mon Sep 17 00:00:00 2001 -From: Frederick Cheung -Date: Fri, 17 Jun 2022 18:57:28 +0100 -Subject: [PATCH] Fix Pointer#initialize using NUM2LL instead of NUM2ULL - -If the high bit of the address was set this would raise RangeError -(bignum too big to convert into long long). This is not uncommon on -platforms that use the high bits of pointers for purposes such as -pointer authentication - -This also now matches Pointer#address which uses ULL2NUM. ---- - ext/ffi_c/Pointer.c | 2 +- - spec/ffi/pointer_spec.rb | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/ext/ffi_c/Pointer.c b/ext/ffi_c/Pointer.c -index 153fff101..79886811f 100644 ---- a/ext/ffi_c/Pointer.c -+++ b/ext/ffi_c/Pointer.c -@@ -112,7 +112,7 @@ ptr_initialize(int argc, VALUE* argv, VALUE self) - switch (TYPE(rbAddress)) { - case T_FIXNUM: - case T_BIGNUM: -- p->memory.address = (void*) (uintptr_t) NUM2LL(rbAddress); -+ p->memory.address = (void*) (uintptr_t) NUM2ULL(rbAddress); - p->memory.size = LONG_MAX; - if (p->memory.address == NULL) { - p->memory.flags = 0; -diff --git a/spec/ffi/pointer_spec.rb b/spec/ffi/pointer_spec.rb -index b216a161d..7a2ac1565 100644 ---- a/spec/ffi/pointer_spec.rb -+++ b/spec/ffi/pointer_spec.rb -@@ -237,6 +237,14 @@ def to_ptr - expect(FFI::Pointer.new(0).slice(0, 10).size_limit?).to be true - end - end -+ -+ describe "#initialise" do -+ it 'can use adresses with high bit set' do -+ max_address = 2**FFI::Platform::ADDRESS_SIZE - 1 -+ pointer = FFI::Pointer.new(:uint8, max_address) -+ expect(pointer.address).to eq(max_address) -+ end -+ end - end - - describe "AutoPointer" do diff --git a/dev-ruby/ffi/files/fix-regenerate-types-conf.patch b/dev-ruby/ffi/files/fix-regenerate-types-conf.patch deleted file mode 100644 index 1c1cca1c7d4d..000000000000 --- a/dev-ruby/ffi/files/fix-regenerate-types-conf.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/ffi/ffi/commit/19348fe09e1aeb08424abdf331c3497159139f20 - -From 19348fe09e1aeb08424abdf331c3497159139f20 Mon Sep 17 00:00:00 2001 -From: matoro -Date: Tue, 14 Mar 2023 21:03:33 -0400 -Subject: [PATCH] Update gen/Rakefile for Ruby 3 compat - -Ruby 3 changed the 'mode' argument from an option hash to keyword -argument. This change is backwards-compatible with Ruby 2. - -See: https://github.com/ruby/fileutils/commit/482de6d397742526d1111576e2791f9b7051e3c0 ---- a/gen/Rakefile -+++ b/gen/Rakefile -@@ -9,7 +9,7 @@ logfile = File.join(File.dirname(__FILE__), 'log') - - file types_conf do |task| - options = {} -- FileUtils.mkdir_p(File.dirname(task.name), { :mode => 0755 }) -+ FileUtils.mkdir_p(File.dirname(task.name), mode: 0755) - File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f| - f.puts FFI::TypesGenerator.generate(options) - end - diff --git a/dev-ruby/ffi/files/pr-957-sparc.patch b/dev-ruby/ffi/files/pr-957-sparc.patch deleted file mode 100644 index b68b5e06a7d4..000000000000 --- a/dev-ruby/ffi/files/pr-957-sparc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 241b10322283743b79c9489993bfb964b5167f7f Mon Sep 17 00:00:00 2001 -From: matoro -Date: Wed, 25 May 2022 14:23:55 -0400 -Subject: [PATCH 1/2] Rename sparc64-linux -> sparcv9-linux - -In https://github.com/ffi/ffi/pull/575, 64-bit sparc was changed to also -use sparcv9 as the platform name, but the types.conf directory was never -renamed. This breaks only on Ruby 3.0 and later due to the fileutils -change to use keyword arguments in -https://github.com/ruby/fileutils/commit/482de6d397742526d1111576e2791f9b7051e3c0 ---- - lib/ffi/platform/{sparc64-linux => sparcv9-linux}/types.conf | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - rename lib/ffi/platform/{sparc64-linux => sparcv9-linux}/types.conf (100%) - -diff --git a/lib/ffi/platform/sparc64-linux/types.conf b/lib/ffi/platform/sparcv9-linux/types.conf -similarity index 100% -rename from lib/ffi/platform/sparc64-linux/types.conf -rename to lib/ffi/platform/sparcv9-linux/types.conf - -From 76dc5c7d69a445268f47f5b6a9185e644bcd68e8 Mon Sep 17 00:00:00 2001 -From: matoro -Date: Mon, 13 Jun 2022 22:56:26 -0400 -Subject: [PATCH 2/2] Also normalize sparc64 -> sparcv9 in test fixture - ---- - spec/ffi/fixtures/compile.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/spec/ffi/fixtures/compile.rb b/spec/ffi/fixtures/compile.rb -index f2e831a63..58ee5611d 100644 ---- a/spec/ffi/fixtures/compile.rb -+++ b/spec/ffi/fixtures/compile.rb -@@ -22,6 +22,8 @@ module TestLibrary - "powerpc64" - when /ppc|powerpc/ - "powerpc" -+ when /sparcv9|sparc64/ -+ "sparcv9" - when /^arm/ - if RbConfig::CONFIG['host_os'] =~ /darwin/ - "aarch64" diff --git a/dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch b/dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch deleted file mode 100644 index 6a76a91c0842..000000000000 --- a/dev-ruby/ffi/files/use-libffi-closure-allocations-on-hppa.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/ffi/ffi/pull/1017 - -From 587822fa8d21292d39400d2276ca49d37a752135 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 9 Apr 2023 02:17:23 +0100 -Subject: [PATCH 1/2] Use libffi closure allocations on hppa - -We currently do this for Apple arm64, but we need to do it for hppa too. ---- a/ext/ffi_c/extconf.rb -+++ b/ext/ffi_c/extconf.rb -@@ -61,6 +61,7 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx' - append_ldflags "-pthread" - - ffi_alloc_default = RbConfig::CONFIG['host_os'] =~ /darwin/i && RbConfig::CONFIG['host'] =~ /arm|aarch64/i -+ ffi_alloc_default = ffi_alloc_default || RbConfig::CONFIG['host'] =~ /hppa/i - if enable_config('libffi-alloc', ffi_alloc_default) - $defs << "-DUSE_FFI_ALLOC" - end --- -2.40.0 - -- cgit v1.2.3