pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases postgresql: fix buildling contrib/uuid-ossp;...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8ae0c0eaa28c
branches: trunk
changeset: 448943:8ae0c0eaa28c
user: adam <adam%pkgsrc.org@localhost>
date: Thu Mar 18 15:04:53 2021 +0000
description:
postgresql: fix buildling contrib/uuid-ossp; fixes for LLVM enabled; should fix #55803
diffstat:
databases/postgresql10-client/buildlink3.mk | 7 ++-
databases/postgresql10-contrib/Makefile | 16 +------
databases/postgresql10/Makefile.common | 13 +++++-
databases/postgresql10/distinfo | 3 +-
databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile | 15 +++++++
databases/postgresql11-client/buildlink3.mk | 7 ++-
databases/postgresql11-contrib/Makefile | 16 +------
databases/postgresql11-contrib/PLIST | 6 ++-
databases/postgresql11/Makefile.common | 13 +++++-
databases/postgresql11/distinfo | 4 +-
databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile | 15 +++++++
databases/postgresql12-client/buildlink3.mk | 7 ++-
databases/postgresql12-contrib/Makefile | 16 +------
databases/postgresql12-contrib/PLIST | 6 ++-
databases/postgresql12/Makefile.common | 13 +++++-
databases/postgresql12/distinfo | 3 +-
databases/postgresql12/patches/patch-contrib_uuid-ossp_Makefile | 15 +++++++
databases/postgresql13-client/buildlink3.mk | 7 ++-
databases/postgresql13-contrib/Makefile | 16 +------
databases/postgresql13-contrib/PLIST | 6 ++-
databases/postgresql13-server/PLIST | 21 ++++++---
databases/postgresql13/Makefile.common | 13 +++++-
databases/postgresql13/distinfo | 5 +-
databases/postgresql13/patches/patch-configure | 20 +++++++--
databases/postgresql13/patches/patch-contrib_uuid-ossp_Makefile | 15 +++++++
databases/postgresql95-client/buildlink3.mk | 7 ++-
databases/postgresql95-contrib/Makefile | 16 +------
databases/postgresql95/Makefile.common | 13 +++++-
databases/postgresql95/distinfo | 3 +-
databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile | 15 +++++++
databases/postgresql96-client/buildlink3.mk | 7 ++-
databases/postgresql96-contrib/Makefile | 16 +------
databases/postgresql96/Makefile.common | 13 +++++-
databases/postgresql96/distinfo | 3 +-
databases/postgresql96/patches/patch-contrib_uuid-ossp_Makefile | 15 +++++++
35 files changed, 267 insertions(+), 119 deletions(-)
diffs (truncated from 945 to 300 lines):
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql10-client/buildlink3.mk
--- a/databases/postgresql10-client/buildlink3.mk Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql10-client/buildlink3.mk Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:42 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:54 adam Exp $
BUILDLINK_TREE+= postgresql10-client
@@ -13,6 +13,11 @@
BUILDLINK_LDADD.postgresql10-client= -lpq ${BUILDLINK_LDADD.gettext}
BUILDLINK_FILES.postgresql10-client+= bin/pg_config
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql10-contrib/Makefile
--- a/databases/postgresql10-contrib/Makefile Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql10-contrib/Makefile Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/02/15 18:58:36 adam Exp $
+# $NetBSD: Makefile,v 1.16 2021/03/18 15:04:54 adam Exp $
PKGNAME= ${DISTNAME:S/-/10-contrib-/}
COMMENT= Contrib subtree of tools and plug-ins
@@ -57,21 +57,9 @@
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 -I${WRKSRC}/contrib/pgcrypto"
-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 -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql10/Makefile.common
--- a/databases/postgresql10/Makefile.common Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql10/Makefile.common Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2021/02/15 18:58:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2021/03/18 15:04:53 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -96,6 +96,17 @@
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 -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql10/distinfo
--- a/databases/postgresql10/distinfo Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql10/distinfo Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/02/15 18:58:36 adam Exp $
+$NetBSD: distinfo,v 1.19 2021/03/18 15:04:53 adam Exp $
SHA1 (postgresql-10.16.tar.bz2) = 594d7f1c604a9666499510d69b6dece97632a61d
RMD160 (postgresql-10.16.tar.bz2) = d112a187f96bb75e39131e48ca7973286e2da89d
@@ -8,6 +8,7 @@
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
SHA1 (patch-src_Makefile.shlib) = 74ab026a457a4789a1aa1d6423d88ce4a2db7a2e
SHA1 (patch-src_backend_Makefile) = 91aa620b3a26f3da66c22aef78611a352a8793b6
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile Thu Mar 18 15:04:53 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:53 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)
+
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql11-client/buildlink3.mk
--- a/databases/postgresql11-client/buildlink3.mk Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql11-client/buildlink3.mk Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:43 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:54 adam Exp $
BUILDLINK_TREE+= postgresql11-client
@@ -13,6 +13,11 @@
BUILDLINK_LDADD.postgresql11-client= -lpq ${BUILDLINK_LDADD.gettext}
BUILDLINK_FILES.postgresql11-client+= bin/pg_config
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql11-contrib/Makefile
--- a/databases/postgresql11-contrib/Makefile Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql11-contrib/Makefile Thu Mar 18 15:04:53 2021 +0000
@@ -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 @@
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 -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql11-contrib/PLIST
--- a/databases/postgresql11-contrib/PLIST Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql11-contrib/PLIST Thu Mar 18 15:04:53 2021 +0000
@@ -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/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
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql11/Makefile.common
--- a/databases/postgresql11/Makefile.common Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql11/Makefile.common Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2021/02/15 18:58:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2021/03/18 15:04:54 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -96,6 +96,17 @@
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 -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql11/distinfo
--- a/databases/postgresql11/distinfo Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql11/distinfo Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/02/15 18:58:37 adam Exp $
+$NetBSD: distinfo,v 1.14 2021/03/18 15:04:54 adam Exp $
SHA1 (postgresql-11.11.tar.bz2) = ebd71258718f08bf20f79a0e0709bee0955df01b
RMD160 (postgresql-11.11.tar.bz2) = 44d9bcd81fc6a89d8e2bcbcbc7353e37e951cfbc
@@ -8,10 +8,10 @@
SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
SHA1 (patch-src_Makefile.shlib) = 4e093c79345add008a56c10d1c1bc8574f7a38e1
SHA1 (patch-src_backend_Makefile) = 209f4cfb1670381838e7f25ead7ab9f0f671f89c
-SHA1 (patch-src_backend_commands_collationcmds.c) = d7d5400ce40ab8da646331473b5a70fb3ef4552f
SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile Thu Mar 18 15:04:53 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:54 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)
+
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql12-client/buildlink3.mk
--- a/databases/postgresql12-client/buildlink3.mk Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql12-client/buildlink3.mk Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:44 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:55 adam Exp $
BUILDLINK_TREE+= postgresql12-client
@@ -13,6 +13,11 @@
BUILDLINK_LDADD.postgresql12-client= -lpq ${BUILDLINK_LDADD.gettext}
BUILDLINK_FILES.postgresql12-client+= bin/pg_config
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff -r 83b7d4925451 -r 8ae0c0eaa28c databases/postgresql12-contrib/Makefile
--- a/databases/postgresql12-contrib/Makefile Thu Mar 18 14:56:31 2021 +0000
+++ b/databases/postgresql12-contrib/Makefile Thu Mar 18 15:04:53 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/15 18:58:39 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/18 15:04:55 adam Exp $
PKGNAME= ${DISTNAME:S/-/12-contrib-/}
COMMENT= Contrib subtree of tools and plug-ins
@@ -56,21 +56,9 @@
TOOLS_BROKEN+= perl
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
Home |
Main Index |
Thread Index |
Old Index