svn commit: r531790 - in head: devel/gitaly net/rubygem-gitaly net/rubygem-grpc124 net/rubygem-grpc124/files www/gitlab-ce
Matthias Fechner
mfechner at FreeBSD.org
Wed Apr 15 20:36:07 UTC 2020
Author: mfechner
Date: Wed Apr 15 20:36:06 2020
New Revision: 531790
URL: https://svnweb.freebsd.org/changeset/ports/531790
Log:
Fixed dependency problems that caused gitaly/gitlab-ce build to fail.
PR: 245559
Reported by: freebsd at wb9.se
Modified:
head/devel/gitaly/Makefile
head/net/rubygem-gitaly/Makefile
head/net/rubygem-grpc124/Makefile
head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb
head/www/gitlab-ce/Makefile
Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile Wed Apr 15 20:17:22 2020 (r531789)
+++ head/devel/gitaly/Makefile Wed Apr 15 20:36:06 2020 (r531790)
@@ -2,7 +2,7 @@
PORTNAME= gitaly
DISTVERSION= 12.9.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= mfechner at FreeBSD.org
@@ -21,11 +21,11 @@ MY_DEPENDS= git>=2.22:devel/git \
rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
- rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \
+ rubygem-grpc124>=1.24.0<1.25.0:net/rubygem-grpc124 \
rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \
rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
rubygem-rbtrace>0:devel/rubygem-rbtrace \
- rubygem-gitlab-labkit=0.11.0:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.11.0<0.11.1:devel/rubygem-gitlab-labkit \
rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38
BUILD_DEPENDS= gem:devel/ruby-gems \
Modified: head/net/rubygem-gitaly/Makefile
==============================================================================
--- head/net/rubygem-gitaly/Makefile Wed Apr 15 20:17:22 2020 (r531789)
+++ head/net/rubygem-gitaly/Makefile Wed Apr 15 20:36:06 2020 (r531790)
@@ -2,6 +2,7 @@
PORTNAME= gitaly
DISTVERSION= 12.9.0.pre.rc4
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,7 +13,7 @@ LICENSE= MIT
#BUILD_DEPENDS= rubygem-bundler>=1.12:sysutils/rubygem-bundler \
# rubygem-rake>=10.0:devel/rubygem-rake
-RUN_DEPENDS= rubygem-grpc>=1.0<2.0:net/rubygem-grpc \
+RUN_DEPENDS= rubygem-grpc124>=1.0<2.0:net/rubygem-grpc124 \
gitaly>=0.86.0:devel/gitaly
USES= gem
Modified: head/net/rubygem-grpc124/Makefile
==============================================================================
--- head/net/rubygem-grpc124/Makefile Wed Apr 15 20:17:22 2020 (r531789)
+++ head/net/rubygem-grpc124/Makefile Wed Apr 15 20:36:06 2020 (r531790)
@@ -2,6 +2,7 @@
PORTNAME= grpc
PORTVERSION= 1.24.0
+PORTREVISION= 1
CATEGORIES= net rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 124
@@ -14,8 +15,8 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libcares.so:dns/c-ares \
libgrpc.so:devel/grpc
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
- rubygem-google-protobuf>=3.8<4:devel/rubygem-google-protobuf \
- rubygem-googleapis-common-protos-types>=1.0<2:devel/rubygem-googleapis-common-protos-types
+ rubygem-google-protobuf38>=3.8<4:devel/rubygem-google-protobuf38 \
+ rubygem-googleapis-common-protos-types104>=1.0<2:devel/rubygem-googleapis-common-protos-types104
USES= gem gmake pkgconfig
USE_RUBY= yes
Modified: head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb
==============================================================================
--- head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb Wed Apr 15 20:17:22 2020 (r531789)
+++ head/net/rubygem-grpc124/files/patch-src_ruby_ext_grpc_extconf.rb Wed Apr 15 20:36:06 2020 (r531790)
@@ -13,7 +13,7 @@
ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG']
ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' if RUBY_PLATFORM =~ /darwin/
ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
-@@ -50,22 +50,22 @@ output_dir = File.expand_path(RbConfig::
+@@ -50,22 +50,23 @@ output_dir = File.expand_path(RbConfig::
grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
ENV['BUILDDIR'] = output_dir
@@ -38,8 +38,11 @@
+#$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 RUBY_PLATFORM =~ /linux/
- $LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/
+-$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/
+-$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/
++#$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/
++#$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /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
Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile Wed Apr 15 20:17:22 2020 (r531789)
+++ head/www/gitlab-ce/Makefile Wed Apr 15 20:36:06 2020 (r531790)
@@ -3,7 +3,7 @@
PORTNAME= gitlab-ce
PORTVERSION= 12.9.2
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -176,7 +176,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-rack-attack>=6.2.0<6.3.0:www/rubygem-rack-attack \
rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \
rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \
- rubygem-gitlab-labkit=0.11.0:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.11.0<0.11.1:devel/rubygem-gitlab-labkit \
rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \
rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
@@ -210,7 +210,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \
rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly>=12.9.0.p.r4<12.10.0:net/rubygem-gitaly \
- rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \
+ rubygem-grpc124>=1.24.0<1.25.0:net/rubygem-grpc124 \
rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 \
rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
rubygem-flipper>=0.17.1<0.18.0:devel/rubygem-flipper \
More information about the svn-ports-all
mailing list