diff options
| author | adam <adam@pkgsrc.org> | 2021-03-18 15:04:53 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2021-03-18 15:04:53 +0000 |
| commit | 5576668f6c84e448c31e87499dee9b22361e11d0 (patch) | |
| tree | f6709546ce697d77e77bb988382a60a09c11595b /databases/postgresql95 | |
| parent | dc71276f1b071dee4e00d314661d1e2efa57d5ce (diff) | |
| download | pkgsrc-5576668f6c84e448c31e87499dee9b22361e11d0.tar.gz | |
postgresql: fix buildling contrib/uuid-ossp; fixes for LLVM enabled; should fix #55803
Diffstat (limited to 'databases/postgresql95')
| -rw-r--r-- | databases/postgresql95/Makefile.common | 13 | ||||
| -rw-r--r-- | databases/postgresql95/distinfo | 3 | ||||
| -rw-r--r-- | databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile | 15 |
3 files changed, 29 insertions, 2 deletions
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index d48c4d788c5..a389a294ad8 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2021/02/15 18:58:40 adam Exp $ +# $NetBSD: Makefile.common,v 1.36 2021/03/18 15:04:55 adam Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -97,6 +97,17 @@ BUILD_DEFS+= PGSQL_BLCKSZ CONFIGURE_ARGS+= --with-blocksize=${PGSQL_BLCKSZ} .endif +# UUID support for contrib/uuid-ossp +# It has to be defined here, because it affects Makefile.global +.if ${OPSYS:M*BSD} +CONFIGURE_ARGS+= --with-uuid=bsd +.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" +CONFIGURE_ARGS+= --with-uuid=e2fs +.elif ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --with-uuid=ossp +.include "../../devel/ossp-uuid/buildlink3.mk" +.endif + # PostgreSQL explicitly forbids any use of -ffast-math BUILDLINK_TRANSFORM+= rm:-ffast-math diff --git a/databases/postgresql95/distinfo b/databases/postgresql95/distinfo index ac8f1c8fc5b..c99937d7a2d 100644 --- a/databases/postgresql95/distinfo +++ b/databases/postgresql95/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2021/02/15 18:58:40 adam Exp $ +$NetBSD: distinfo,v 1.28 2021/03/18 15:04:55 adam Exp $ SHA1 (postgresql-9.5.25.tar.bz2) = 06775dad91cff791d54f07aef4499eb844843932 RMD160 (postgresql-9.5.25.tar.bz2) = 29bc5f749edd9b3f45d133f970a593dd610b72fb @@ -8,6 +8,7 @@ SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c SHA1 (patch-configure) = 18dd4af7f043b090beda157dfd52531b551eafd0 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921 +SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a SHA1 (patch-src_Makefile.shlib) = a809ef756e9314723476fe7408a97d23f83a0311 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca diff --git a/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile b/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile new file mode 100644 index 00000000000..817bfa3336b --- /dev/null +++ b/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:56 adam Exp $ + +Use relative path, as top_srcdir points to PREFIX. + +--- contrib/uuid-ossp/Makefile.orig 2021-02-08 21:56:03.000000000 +0000 ++++ contrib/uuid-ossp/Makefile +@@ -12,7 +12,7 @@ REGRESS = uuid_ossp + SHLIB_LINK += $(UUID_LIBS) + + # We copy some needed files verbatim from pgcrypto +-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto ++pgcrypto_src = ../pgcrypto + + PG_CPPFLAGS = -I$(pgcrypto_src) + |