Fri Feb 19 13:25:39 2021 UTC ()
Build the frontend libraries first to fix parallel build errors.


(joerg)
diff -r1.5 -r1.6 pkgsrc/databases/postgresql13-client/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/databases/postgresql13-client/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/postgresql13-client/Makefile 2021/02/15 18:58:39 1.5
+++ pkgsrc/databases/postgresql13-client/Makefile 2021/02/19 13:25:39 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2021/02/15 18:58:39 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2021/02/19 13:25:39 joerg Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/13-client-/} 3PKGNAME= ${DISTNAME:S/-/13-client-/}
4COMMENT= PostgreSQL database client programs 4COMMENT= PostgreSQL database client programs
5 5
6.include "../../databases/postgresql13/Makefile.common" 6.include "../../databases/postgresql13/Makefile.common"
7 7
8USE_TOOLS+= gzip msgfmt tar 8USE_TOOLS+= gzip msgfmt tar
9TOOLS_BROKEN+= perl 9TOOLS_BROKEN+= perl
10CONFIGURE_ARGS+= --with-openssl 10CONFIGURE_ARGS+= --with-openssl
11CONFIGURE_ARGS+= --with-zlib 11CONFIGURE_ARGS+= --with-zlib
12 12
13# Override INSTALL script to avoid unprivileged user/group 13# Override INSTALL script to avoid unprivileged user/group
14# leaking into the binary package 14# leaking into the binary package
@@ -29,32 +29,33 @@ PGSQL_THREAD_SAFETY?= no @@ -29,32 +29,33 @@ PGSQL_THREAD_SAFETY?= no
29.endif 29.endif
30PGSQL_THREAD_SAFETY?= yes 30PGSQL_THREAD_SAFETY?= yes
31BUILD_DEFS+= PGSQL_THREAD_SAFETY 31BUILD_DEFS+= PGSQL_THREAD_SAFETY
32 32
33.if !empty(PGSQL_THREAD_SAFETY:M[yY][eE][sS]) 33.if !empty(PGSQL_THREAD_SAFETY:M[yY][eE][sS])
34. include "../../mk/pthread.buildlink3.mk" 34. include "../../mk/pthread.buildlink3.mk"
35. if (${PTHREAD_TYPE} == "native") 35. if (${PTHREAD_TYPE} == "native")
36CONFIGURE_ARGS+= --enable-thread-safety 36CONFIGURE_ARGS+= --enable-thread-safety
37. endif 37. endif
38.else 38.else
39CONFIGURE_ARGS+= --disable-thread-safety 39CONFIGURE_ARGS+= --disable-thread-safety
40.endif 40.endif
41 41
 42BUILD_DIRS+= src/fe_utils
42INSTALL_DIRS= src/include 43INSTALL_DIRS= src/include
43INSTALL_DIRS+= src/common 44INSTALL_DIRS+= src/common
44INSTALL_DIRS+= src/port 45INSTALL_DIRS+= src/port
45INSTALL_DIRS+= src/interfaces 46INSTALL_DIRS+= src/interfaces
46INSTALL_DIRS+= src/bin 47INSTALL_DIRS+= src/bin
47BUILD_DIRS= ${INSTALL_DIRS} 48BUILD_DIRS+= ${INSTALL_DIRS}
48# Without this, the Darwin build fails (related to -bundle_loader). 49# Without this, the Darwin build fails (related to -bundle_loader).
49BUILD_DIRS+= src/backend 50BUILD_DIRS+= src/backend
50 51
51.for f in pg_service.conf psqlrc 52.for f in pg_service.conf psqlrc
52CONF_FILES+= share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f} 53CONF_FILES+= share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
53.endfor 54.endfor
54 55
55.include "../../devel/zlib/buildlink3.mk" 56.include "../../devel/zlib/buildlink3.mk"
56.include "../../security/openssl/buildlink3.mk" 57.include "../../security/openssl/buildlink3.mk"
57 58
58SUBST_CLASSES+= pgxs 59SUBST_CLASSES+= pgxs
59SUBST_STAGE.pgxs= post-build 60SUBST_STAGE.pgxs= post-build
60SUBST_MESSAGE.pgxs= Fixing workdir tools references in pgxs Makefile 61SUBST_MESSAGE.pgxs= Fixing workdir tools references in pgxs Makefile