This is an automated email from the ASF dual-hosted git repository. alsay pushed a commit to branch create_extension_fix in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-postgresql.git
commit 44ecc22ef2b6c361b8943cbe7320d55a90e01413 Author: AlexanderSaydakov <[email protected]> AuthorDate: Fri Aug 16 15:14:27 2019 -0700 create extension fix --- Makefile | 15 ++++++++++++--- datasketches.control | 5 ++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d5995c8..5bfddba 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,11 @@ EXTENSION = datasketches +EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") MODULE_big = datasketches +SQL_MODULES = 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 +SQL_INSTALL = sql/$(EXTENSION)--$(EXTVERSION).sql +DATA = $(SQL_INSTALL) + OBJS = src/base64.o src/common.o \ src/kll_float_sketch_pg_functions.o src/kll_float_sketch_c_adapter.o \ src/cpc_sketch_pg_functions.o src/cpc_sketch_c_adapter.o \ @@ -13,11 +18,15 @@ CORE = datasketches-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 PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) + +# generate combined sql +$(SQL_INSTALL): $(sort $(SQL_MODULES)) + cat $^ > $@ + +install: $(SQL_INSTALL) diff --git a/datasketches.control b/datasketches.control index 7433fb9..0b72b3a 100644 --- a/datasketches.control +++ b/datasketches.control @@ -1,6 +1,5 @@ -# Datasketches module -comment = 'Aggregation functions and data types for approximate algorithms.' +# DataSketches extension +comment = 'Aggregation functions and data types for approximate algorithms' default_version = '1.3.0' relocatable = true - module_pathname = '$libdir/datasketches' --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
