From aca90ac1d92ea400464c5be813ec67b11c1c129b Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Thu, 3 Oct 2019 23:31:23 +0200 Subject: [PATCH] upgrading package: postgresql-datasketches 1.1.0.20190807 -> 1.1.0.20191003 --- postgresql-datasketches/postgresql-datasketches.patch | 11 +++++------ postgresql-datasketches/postgresql-datasketches.spec | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/postgresql-datasketches/postgresql-datasketches.patch b/postgresql-datasketches/postgresql-datasketches.patch index f0ccc32d92..9b98531233 100644 --- a/postgresql-datasketches/postgresql-datasketches.patch +++ b/postgresql-datasketches/postgresql-datasketches.patch @@ -1,18 +1,17 @@ Index: Makefile ---- Makefile.orig 2019-07-10 17:59:43.309256000 +0200 -+++ Makefile 2019-07-10 18:00:25.329688000 +0200 -@@ -9,14 +9,15 @@ +--- Makefile.orig 2019-10-03 23:30:22.133521000 +0200 ++++ Makefile 2019-10-03 23:30:52.038937000 +0200 +@@ -16,13 +16,14 @@ 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 - DATA = sql/datasketches_cpc_sketch.sql sql/datasketches_kll_float_sketch.sql sql/datasketches_theta_sketch.sql sql/datasketches_frequent_strings_sketch.sql sql/datasketches_hll_sketch.sql - --PG_CPPFLAGS = -std=c++11 -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 = -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 -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 diff --git a/postgresql-datasketches/postgresql-datasketches.spec b/postgresql-datasketches/postgresql-datasketches.spec index 27bd49262e..a4cab5e3de 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 20190807 +%define V_snap 20191003 # package information Name: postgresql-datasketches @@ -36,7 +36,7 @@ Class: EVAL Group: Database License: Apache Version: %{V_base}.%{V_snap} -Release: 20190807 +Release: 20191003 # list of sources Source0: http://download.openpkg.org/components/versioned/postgresql-datasketches/postgresql-datasketches-%{V_snap}.tar.xz