mirror of
https://git.freebsd.org/ports.git
synced 2025-07-01 01:20:31 -04:00
0bbacd67dc
Accessing the project page or doing anything that is related to a license file caused segfault in gitaly. Upgrading now the gems to this specific version fixed the problem. As we need to use a prerelease of rubygem-grpc, it is added as extra port. Please see also upstream here: https://gitlab.com/gitlab-org/gitlab/-/issues/345693 PR: 259848 Reported by: admin@asu-vei.ru
51 lines
2 KiB
Ruby
51 lines
2 KiB
Ruby
--- src/ruby/ext/grpc/extconf.rb.orig 2021-11-20 10:39:15 UTC
|
|
+++ src/ruby/ext/grpc/extconf.rb
|
|
@@ -45,9 +45,9 @@ if darwin && !cross_compiling
|
|
ENV['ARFLAGS'] = '-o'
|
|
end
|
|
|
|
-ENV['EMBED_OPENSSL'] = 'true'
|
|
-ENV['EMBED_ZLIB'] = 'true'
|
|
-ENV['EMBED_CARES'] = 'true'
|
|
+ENV['EMBED_OPENSSL'] = 'false'
|
|
+ENV['EMBED_ZLIB'] = 'false'
|
|
+ENV['EMBED_CARES'] = 'false'
|
|
|
|
ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG']
|
|
if darwin && !cross_compiling
|
|
@@ -66,22 +66,23 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir
|
|
grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
|
|
ENV['BUILDDIR'] = output_dir
|
|
|
|
-unless windows
|
|
- puts 'Building internal gRPC into ' + grpc_lib_dir
|
|
- nproc = 4
|
|
- nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors
|
|
- make = bsd ? 'gmake' : 'make'
|
|
- system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
|
|
- exit 1 unless $? == 0
|
|
-end
|
|
+# unless windows
|
|
+# puts 'Building internal gRPC into ' + grpc_lib_dir
|
|
+# nproc = 4
|
|
+# nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors
|
|
+# make = bsd ? 'gmake' : 'make'
|
|
+# system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
|
|
+# exit 1 unless $? == 0
|
|
+# end
|
|
|
|
-$CFLAGS << ' -I' + File.join(grpc_root, 'include')
|
|
+# $CFLAGS << ' -I' + File.join(grpc_root, 'include')
|
|
|
|
ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export')
|
|
-$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux
|
|
-$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if darwin
|
|
+# $LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux
|
|
+# $LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if darwin
|
|
+$LDFLAGS << ' -lgrpc' unless windows
|
|
|
|
-$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows
|
|
+# $LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows
|
|
if grpc_config == 'gcov'
|
|
$CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage'
|
|
$LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic'
|