Use PG_CFLAGS

Author: mkgrgis

GitHubActions/build_sqlite_fdw.sh

@@ -21,7 +21,7 @@ mkdir -p ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw
 tar zxf ./sqlite_fdw.tar.gz -C ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw/
 cd ./workdir/postgresql-${VERSION}/contrib/sqlite_fdw
 
-vars='CI_ENV=1 LD_LIBRARY_PATH=/usr/local/lib:/usr/lib'
+vars='CI_ENV=1'
 
 if [ "$MODE" == "postgis" ]; then
   make $vars ENABLE_GIS=1

Makefile

@@ -15,19 +15,27 @@ OBJS = connection.o option.o deparse.o sqlite_query.o sqlite_fdw.o sqlite_data_n
 EXTENSION = sqlite_fdw
 DATA = sqlite_fdw--1.0.sql sqlite_fdw--1.0--1.1.sql
 
+# Use local downloaded and compiles SQLite library instead of system
+ifdef CI_ENV
+override PG_CFLAGS += -L/usr/local/lib
+endif
+
 ifdef ENABLE_GIS
 override PG_CFLAGS += -DSQLITE_FDW_GIS_ENABLE
 GISTEST = postgis
 else
 GISTEST = nogis
 endif
 
+# Tests for PostgreSQL data types support
 TYPETESTS = types/bitstring types/bool types/float4 types/float8 types/int4 types/int8 types/json types/numeric types/$(GISTEST) types/macaddr types/macaddr8 types/out_of_range types/timestamp types/uuid
 
 ifndef REGRESS
+# System tests, full default sequence
 REGRESS = extra/sqlite_fdw_post $(TYPETESTS) extra/join extra/limit extra/aggregates extra/prepare extra/select_having extra/select extra/insert extra/update extra/encodings sqlite_fdw type_$(GISTEST) aggregate selectfunc
 endif
 
+# Other encodings also sre tested. Client encoding should be UTF-8-
 REGRESS_OPTS = --encoding=utf8
 
 UNAME = uname
@@ -38,10 +46,6 @@ else
 DLSUFFIX = .so
 endif
 
-ifdef CI_ENV
-override LDFLAGS += -L/usr/local/lib
-endif
-
 SHLIB_LINK := -lsqlite3
 
 ifdef ENABLE_GIS
@@ -75,12 +79,12 @@ REGRESS := $(addprefix $(REGRESS_PREFIX_SUB)/,$(REGRESS))
 $(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/extra)
 $(shell mkdir -p results/$(REGRESS_PREFIX_SUB)/types)
 
-$(info    SHLIB_LINK      is $(SHLIB_LINK))
-$(info    LD_LIBRARY_PATH is $(LD_LIBRARY_PATH))
-$(info    REGRESS         is $(REGRESS))
-$(info    DLSUFFIX        is $(DLSUFFIX))
-$(info    CI_ENV          is $(CI_ENV))
-$(info    ENABLE_GIS      is $(ENABLE_GIS))
+# $(info    SHLIB_LINK      is $(SHLIB_LINK))
+# $(info    LD_LIBRARY_PATH is $(LD_LIBRARY_PATH))
+# $(info    REGRESS         is $(REGRESS))
+# $(info    DLSUFFIX        is $(DLSUFFIX))
+# $(info    CI_ENV          is $(CI_ENV))
+# $(info    ENABLE_GIS      is $(ENABLE_GIS))
 
 ifdef ENABLE_GIS
 check: temp-install