From owner-dev-commits-ports-all@freebsd.org Mon Jul 5 06:08:23 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D1ABC65446D; Mon, 5 Jul 2021 06:08:23 +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 4GJFc75NX7z3s5K; Mon, 5 Jul 2021 06:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9CE65205E9; Mon, 5 Jul 2021 06:08:23 +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 16568NjM077553; Mon, 5 Jul 2021 06:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16568Nwu077552; Mon, 5 Jul 2021 06:08:23 GMT (envelope-from git) Date: Mon, 5 Jul 2021 06:08:23 GMT Message-Id: <202107050608.16568Nwu077552@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: 6bd317c1fcee - 2021Q3 - databases/rubygem-pg_query: Fix unknown type name 'PgQueryProtobuf' 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/2021Q3 X-Git-Reftype: branch X-Git-Commit: 6bd317c1fceee41e30770e5e1dd1ba3ae65e8a89 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jul 2021 06:08:23 -0000 The branch 2021Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bd317c1fceee41e30770e5e1dd1ba3ae65e8a89 commit 6bd317c1fceee41e30770e5e1dd1ba3ae65e8a89 Author: VVD AuthorDate: 2021-07-05 06:00:01 +0000 Commit: Matthias Fechner CommitDate: 2021-07-05 06:06:56 +0000 databases/rubygem-pg_query: Fix unknown type name 'PgQueryProtobuf' Make sure to use internal pg_query lib. Patch is already included upstream in version 2.1.0: https://github.com/pganalyze/pg_query/pull/216/files This should fix the build outside of poudriere. PR: 256741 Reported by: VVD (cherry picked from commit 4bbd995b742469b4d3c5a37f761dfaa6c32f3d76) --- databases/rubygem-pg_query/Makefile | 6 ++---- databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile index af2526f2ddb8..601be2a32351 100644 --- a/databases/rubygem-pg_query/Makefile +++ b/databases/rubygem-pg_query/Makefile @@ -2,7 +2,7 @@ PORTNAME= pg_query PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -12,9 +12,7 @@ COMMENT= Parses SQL queries using a copy of the PostgreSQL server query parser LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -MY_DEPENDS= ${LOCALBASE}/lib/libpg_query.a:databases/libpg_query -BUILD_DEPENDS= ${MY_DEPENDS} \ - rubygem-pathname>0:devel/rubygem-pathname +BUILD_DEPENDS= rubygem-pathname>0:devel/rubygem-pathname # rubygem-google-protobuf 3.17.1 is required to fix a segfault # see PR: https://github.com/pganalyze/pg_query/pull/212 # and https://github.com/pganalyze/pg_query/pull/213 diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb index f9ed045ae1ac..888855f4e6bb 100644 --- a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb +++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb @@ -1,17 +1,18 @@ ---- ext/pg_query/extconf.rb.orig 2021-05-19 21:51:31 UTC +--- ext/pg_query/extconf.rb.orig 2021-07-05 05:53:16 UTC +++ ext/pg_query/extconf.rb -@@ -7,13 +7,6 @@ require 'pathname' +@@ -7,13 +7,8 @@ require 'pathname' $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s } -$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g" -- ++$CFLAGS << " -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -DHAVE_STRCHRNUL -g" + -SYMFILE = File.join(__dir__, 'pg_query_ruby.sym') -if RUBY_PLATFORM =~ /darwin/ - $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius) -else - $DLDFLAGS << " -Wl,--retain-symbols-file=#{SYMFILE}" -end -+$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -DHAVE_STRCHRNUL -g" ++$INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS create_makefile 'pg_query/pg_query'