Attachment 226227 Details for Bug 256741 – Merged upstream fix + removed dependency from databases/libpg_query

[patch] Merged upstream fix + removed dependency from databases/libpg_query

rubygem-pg_query.diff (text/plain), 1.64 KB, created by Vladimir Druzenko on 2021-07-04 22:56:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-07-04 22:56:08 UTC

Size: 1.64 KB

patch

obsolete

>diff -ur databases/rubygem-pg_query.orig/Makefile databases/rubygem-pg_query/Makefile
>--- databases/rubygem-pg_query.orig/Makefile
>+++ databases/rubygem-pg_query/Makefile
>@@ -12,9 +12,7 @@
> 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 -ur databases/rubygem-pg_query.orig/files/patch-ext_pg__query_extconf.rb databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
>--- databases/rubygem-pg_query.orig/files/patch-ext_pg__query_extconf.rb
>+++ databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
>@@ -1,6 +1,6 @@
> --- ext/pg_query/extconf.rb.orig	2021-05-19 21:51:31 UTC
> +++ ext/pg_query/extconf.rb
>-@@ -7,13 +7,6 @@ require 'pathname'
>+@@ -7,13 +7,7 @@ require 'pathname'
>  
>  $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
>  
>@@ -12,6 +12,7 @@
> -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"
>++$CFLAGS << " -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'

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 256741: 225960 | 226039 | 226202 | 226227