From nobody Thu Jan 12 09:53:28 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nt0HD4w8Qz2p8hF; Thu, 12 Jan 2023 09:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nt0HD4Tfmz455P; Thu, 12 Jan 2023 09:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673517208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bn/GBIh/756ycb2y+FWLtmzUASmkCAPUu3GJuVOd9Pk=; b=AtlChjmSTCeNb+4UZyju44KY/ZIddfUqMe8UUT4U2/YR4PYXJkScrXvPWbrnL/N5aTaLFd M4FjLdNDwhnvLuGqgYw5oMCc2tvYkdy8BokbjjH77pIBx2PEvFs2VO8cFlnMvKN5vlJeS9 X7nd5/1CZ50QIHX/DR8HES8LWEmP8VfZGMUhsYgk4Glz0bNL3h0CZq9bdaO2O4loLMft5u P3fiBetbRKCWw2dtM1C5uPCby2dDGJhVX140jr4IAWEOftEfSoCLVuokhQFAQH0Ezc4Z6K 10qLnTMCYCfNr/ZNaNKgEMsRHjdj8ux36f4e2EmYdZ82zzQ7UDTNMHUQETeAyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673517208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bn/GBIh/756ycb2y+FWLtmzUASmkCAPUu3GJuVOd9Pk=; b=SotRxzsWPx2zXyjMFAGDdHyy2uIEfY9F8laCN4ivaKKmpoPI/Ju62vw2Vq+BBrf+ULC6Qg Q4rqQuRQwPibnNFF4Mk8SbSFnKdBz5GdJfDlUINLfGwzeznBpnjibWB5109OybYEQ05m/g TOrU3rH9XBrq1WI2bltGOjn3fON8EVYsKVKaYgOtimNVK+y8kheCJqRG3WqVrNZNmwNX4i nrblFzqaOr519lSx/xTIzXXwEHHCFu+sff6j95V0pe40dd/TDZQ0tkIn6adeUET3142GTy Z7LNEEjofV1kTyGcdvLn6rM/kiouuIADHwSS2Grj4ViKSdhb9FH0BfkevMd/3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673517208; a=rsa-sha256; cv=none; b=ynrKVvx3zKwOosoA7wfkr+yxChOlXUCB5whNRbS14MvIkWuEFdSUAmtU+QvGRkG7l2k/bj Xkhw4vPG9/0ELoAKuJ+9tP5KV59Etbb6DTYgOcd6HW6MhIWYYyfOYp0yLZ/oSF0ac0WYgq F/ZxKsUhWaPBgDewLjXYqUNSxnIs3KjcujtaCHBJJlVsfagdvJOFFa6ogak1dlsQ7PZLKN mkYko2CMDaiuhU/c/stAiCq4BIwb7tEZ6cqZJwOR1sebhQiQDcxTlBzhl+GlsJvmckF0GG yyeGRHyGwY5qCnfJFX/rF12mWotB1Yic1AI1fMwE7T0Za/Lg1Jlf2gydEX6p4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nt0HD3F5zzNh5; Thu, 12 Jan 2023 09:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30C9rSTg093404; Thu, 12 Jan 2023 09:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30C9rSfZ093403; Thu, 12 Jan 2023 09:53:28 GMT (envelope-from git) Date: Thu, 12 Jan 2023 09:53:28 GMT Message-Id: <202301120953.30C9rSfZ093403@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 9ea8a1445562 - 2023Q1 - devel/rubygem-oj-introspect: added new port List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 9ea8a14455628b073e8bec196b120f46c78200dc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ea8a14455628b073e8bec196b120f46c78200dc commit 9ea8a14455628b073e8bec196b120f46c78200dc Author: Matthias Fechner AuthorDate: 2022-12-20 18:03:13 +0000 Commit: Matthias Fechner CommitDate: 2023-01-12 05:58:26 +0000 devel/rubygem-oj-introspect: added new port Required for gitlab-ce 15.6. (cherry picked from commit 78a749f6241b911d5dab458908c7327890cfe7f2) --- devel/rubygem-oj-introspect/Makefile | 6 +++++- .../files/patch-ext_oj-introspect_extconf.rb | 25 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/devel/rubygem-oj-introspect/Makefile b/devel/rubygem-oj-introspect/Makefile index ce3fe2189a44..ba1da0bf6608 100644 --- a/devel/rubygem-oj-introspect/Makefile +++ b/devel/rubygem-oj-introspect/Makefile @@ -10,9 +10,13 @@ WWW= https://github.com/meinac/oj-introspect LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-oj>=3.13.23<3.14:devel/rubygem-oj +MY_DEPENDS= rubygem-oj>=3.13.23<3.14:devel/rubygem-oj +BUILD_DEPENDS= ${MY_DEPENDS} +RUN_DEPENDS= ${MY_DEPENDS} USES= gem USE_RUBY= yes +#USE_RUBY_EXTCONF= yes +#RUBY_EXTCONF_SUBDIRS= ext/oj-introspect .include diff --git a/devel/rubygem-oj-introspect/files/patch-ext_oj-introspect_extconf.rb b/devel/rubygem-oj-introspect/files/patch-ext_oj-introspect_extconf.rb new file mode 100644 index 000000000000..11cdf262eeb3 --- /dev/null +++ b/devel/rubygem-oj-introspect/files/patch-ext_oj-introspect_extconf.rb @@ -0,0 +1,25 @@ +--- ext/oj-introspect/extconf.rb.orig 2023-01-10 13:31:58 UTC ++++ ext/oj-introspect/extconf.rb +@@ -7,22 +7,6 @@ oj_version_file_path = Pathname.new(oj_version_file) + + OJ_HEADERS = oj_version_file_path.join('..', '..', '..', 'ext', 'oj').to_s + +-cc_version = `#{RbConfig.expand("$(CC) --version".dup)}` +-if cc_version.match?(/clang/i) +- # Ignore symbols loaded from Oj in case Ruby is compiled without +- # "-Wl,-undefined,dynamic_lookup" (related to https://bugs.ruby-lang.org/issues/19005) +- symfile = File.join(__dir__, 'oj.sym') +- dynamic_symbols = File.readlines(symfile) +- dynamic_symbols.each do |sym| +- $DLDFLAGS << " -Wl,-U,#{sym.strip}" +- end +- +- # Needed for Ruby 3.2 ABI check: https://github.com/ruby/ruby/pull/5474 +- if RUBY_VERSION >= "3.2" +- $LDFLAGS << " -Wl,-exported_symbol,_ruby_abi_version" +- end +-end +- + dir_config('oj', [OJ_HEADERS], []) + + create_makefile("oj/introspect/introspect_ext")