Skip to content

Commit 4ba9733

Browse files
habermancopybara-github
authored andcommitted
Removed wrap_memcpy.c compatibility shim for pre-2.14 glibc
This shim was added in 2017 to make binary gems compatible with pre-2.14 glibc: #2804 glibc 2.14 was released in 2011. Our Python wheels build for manylinux 2014, which requires glibc 2.17 or later: https://github.com/pypa/manylinux?tab=readme-ov-file#manylinux2014-centos-7-based-glibc-217 We should no longer need binary compatibility with a 14-year-old glibc. Fixes: #11935 PiperOrigin-RevId: 776288819
1 parent 15fa74e commit 4ba9733

File tree

3 files changed

+2
-38
lines changed

3 files changed

+2
-38
lines changed

ruby/ext/google/protobuf_c/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ PROTOBUF_C_SOURCES = [
2121
"shared_convert.h",
2222
"shared_message.c",
2323
"shared_message.h",
24-
"wrap_memcpy.c",
2524
]
2625

2726
# We copy everything into a copy/ subdirectory so that we can use the

ruby/ext/google/protobuf_c/extconf.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,11 @@
2828
$CFLAGS += " -std=gnu99 #{additional_c_flags}"
2929
end
3030

31-
if RUBY_PLATFORM =~ /linux/
32-
# Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
33-
$LDFLAGS += " -Wl,-wrap,memcpy"
34-
end
35-
3631
$VPATH << "$(srcdir)/third_party/utf8_range"
3732
$INCFLAGS += " -I$(srcdir)/third_party/utf8_range"
3833

39-
$srcs = ["protobuf.c", "convert.c", "defs.c", "message.c",
40-
"repeated_field.c", "map.c", "ruby-upb.c", "wrap_memcpy.c",
41-
"utf8_range.c", "shared_convert.c",
34+
$srcs = ["protobuf.c", "convert.c", "defs.c", "message.c", "repeated_field.c",
35+
"map.c", "ruby-upb.c", "utf8_range.c", "shared_convert.c",
4236
"shared_message.c"]
4337

4438
create_makefile(ext_name)

ruby/ext/google/protobuf_c/wrap_memcpy.c

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)