diff --git a/postgresql-datasketches/postgresql-datasketches.patch b/postgresql-datasketches/postgresql-datasketches.patch index 9b98531233..46e897199c 100644 --- a/postgresql-datasketches/postgresql-datasketches.patch +++ b/postgresql-datasketches/postgresql-datasketches.patch @@ -1,20 +1,17 @@ Index: Makefile ---- Makefile.orig 2019-10-03 23:30:22.133521000 +0200 -+++ Makefile 2019-10-03 23:30:52.038937000 +0200 -@@ -16,13 +16,14 @@ +--- Makefile.orig 2020-02-10 20:02:01.113429000 +0100 ++++ Makefile 2020-02-10 20:05:36.688562000 +0100 +@@ -33,11 +33,11 @@ src/hll_sketch_pg_functions.o src/hll_sketch_c_adapter.o # assume a copy or link datasketches-cpp in the current dir -CORE = datasketches-cpp +CORE = sketches-core-cpp - CPC = $(CORE)/cpc/src - OBJS += $(CPC)/cpc_sketch.o $(CPC)/fm85.o $(CPC)/fm85Compression.o $(CPC)/fm85Confidence.o $(CPC)/fm85Merging.o $(CPC)/fm85Util.o $(CPC)/iconEstimator.o $(CPC)/u32Table.o - --PG_CPPFLAGS = -std=c++11 -fPIC -I/usr/local/include -I$(CORE)/kll/include -I$(CORE)/common/include -I$(CORE)/cpc/include -I$(CORE)/theta/include -I$(CORE)/fi/include -I$(CORE)/hll/include +-PG_CPPFLAGS = -fPIC -I/usr/local/include -I$(CORE)/kll/include -I$(CORE)/common/include -I$(CORE)/cpc/include -I$(CORE)/theta/include -I$(CORE)/fi/include -I$(CORE)/hll/include ++PG_CPPFLAGS = -fPIC -I$(CORE)/kll/include -I$(CORE)/common/include -I$(CORE)/cpc/include -I$(CORE)/theta/include -I$(CORE)/fi/include -I$(CORE)/hll/include + PG_CXXFLAGS = -std=c++11 -SHLIB_LINK = -lstdc++ -L/usr/local/lib -+CXX = g++ -+PG_CPPFLAGS = -I$(CORE)/kll/include -I$(CORE)/hll/include -I$(CORE)/common/include -I$(CORE)/cpc/include -I$(CORE)/theta/include -I$(CORE)/fi/include +SHLIB_LINK = -lstdc++ PG_CONFIG = pg_config diff --git a/postgresql-datasketches/postgresql-datasketches.spec b/postgresql-datasketches/postgresql-datasketches.spec index e3003a8da2..138e794e95 100644 --- a/postgresql-datasketches/postgresql-datasketches.spec +++ b/postgresql-datasketches/postgresql-datasketches.spec @@ -23,7 +23,7 @@ # package version %define V_base 1.1.0 -%define V_snap 20191003 +%define V_snap 20200210 # package information Name: postgresql-datasketches @@ -36,7 +36,7 @@ Class: EVAL Group: Database License: Apache Version: %{V_base}.%{V_snap} -Release: 20191003 +Release: 20200210 # list of sources Source0: http://download.openpkg.org/components/versioned/postgresql-datasketches/postgresql-datasketches-%{V_snap}.tar.xz