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/postgresql11-contrib | |
| 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/postgresql11-contrib')
| -rw-r--r-- | databases/postgresql11-contrib/Makefile | 16 | ||||
| -rw-r--r-- | databases/postgresql11-contrib/PLIST | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile index 93865dc3cdc..78bdb065532 100644 --- a/databases/postgresql11-contrib/Makefile +++ b/databases/postgresql11-contrib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2021/02/15 18:58:38 adam Exp $ +# $NetBSD: Makefile,v 1.13 2021/03/18 15:04:54 adam Exp $ PKGNAME= ${DISTNAME:S/-/11-contrib-/} COMMENT= Contrib subtree of tools and plug-ins @@ -56,21 +56,9 @@ TOOLS_BROKEN+= perl CONFIGURE_ARGS+= --with-openssl PLIST_VARS+= uuid -.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" +.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" PLIST.uuid= yes BUILD_DIRS+= contrib/uuid-ossp -. if ${OPSYS:M*BSD} -BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20" -CONFIGURE_ARGS+= --with-uuid=bsd -. elif ${OPSYS} == "Linux" -BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS" -CONFIGURE_ARGS+= --with-uuid=e2fs -. elif ${OPSYS} == "SunOS" -BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP" -CONFIGURE_ARGS+= --with-uuid=ossp -BUILD_MAKE_FLAGS+= UUID_LIBS=-lossp-uuid -. include "../../devel/ossp-uuid/buildlink3.mk" -. endif .endif PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}} diff --git a/databases/postgresql11-contrib/PLIST b/databases/postgresql11-contrib/PLIST index 211d293fee4..01b292c1236 100644 --- a/databases/postgresql11-contrib/PLIST +++ b/databases/postgresql11-contrib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2018/11/09 18:12:24 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2021/03/18 15:04:54 adam Exp $ bin/oid2name bin/pg_standby bin/vacuumlo @@ -178,6 +178,10 @@ ${PLIST.llvm}lib/postgresql/bitcode/tsm_system_time.index.bc ${PLIST.llvm}lib/postgresql/bitcode/tsm_system_time/tsm_system_time.bc ${PLIST.llvm}lib/postgresql/bitcode/unaccent.index.bc ${PLIST.llvm}lib/postgresql/bitcode/unaccent/unaccent.bc +${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp.index.bc +${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/md5.bc +${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/sha1.bc +${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/uuid-ossp.bc lib/postgresql/btree_gin.so lib/postgresql/btree_gist.so lib/postgresql/citext.so |