Commit78629f9

committed

Merge branch 'rum_arrays_v1.2'

2 parentscacbf1c +bdd83b1 commit78629f9Copy full SHA for 78629f9

File tree

+1123

-25

lines changed

+1123

-25

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ DATA_built = rum--$(EXTVERSION).sql $(DATA_updates)`
`18`	`18`	`INCLUDES = rum.h rumsort.h`
`19`	`19`	`RELATIVE_INCLUDES =$(addprefix src/,$(INCLUDES))`
`20`	`20`
	`21`	`+LDFLAGS_SL +=$(filter -lm,$(LIBS))`
	`22`	`+`
`21`	`23`	`REGRESS = rum rum_hash ruminv timestamp orderby orderby_hash altorder\`
`22`	`24`	`altorder_hash limits\`
`23`	`25`	`int2 int4 int8 float4 float8 money oid\`
`24`	`26`	`time timetz date interval\`
`25`	`27`	`macaddr inet cidr text varchar char bytea bit varbit\`
`26`	`28`	`numeric anyarray`
`27`	`29`
`28`		`-LDFLAGS_SL +=$(filter -lm,$(LIBS))`
`29`		`-`
`30`	`30`	`ifdefUSE_PGXS`
`31`	`31`	`PG_CONFIG = pg_config`
`32`	`32`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`@@ -38,6 +38,12 @@ include $(top_builddir)/src/Makefile.global`
`38`	`38`	`include$(top_srcdir)/contrib/contrib-global.mk`
`39`	`39`	`endif`
`40`	`40`
	`41`	`+ifeq ($(MAJORVERSION), 9.6)`
	`42`	`+# arrays are not supported on 9.6`
	`43`	`+else`
	`44`	`+REGRESS += array`
	`45`	`+endif`
	`46`	`+`
`41`	`47`	`wal-check: temp-install`
`42`	`48`	`$(prove_check)`
`43`	`49`

Comments

(0)