Gentoo Archives: gentoo-commits

From: "罗百科" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/
Date: Thu, 12 May 2022 20:06:41
Message-Id: 1652385994.124a43c946d8c17126b3fc46941513b339a52af5.patrick@gentoo
1 commit: 124a43c946d8c17126b3fc46941513b339a52af5
2 Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 12 20:05:46 2022 +0000
4 Commit: 罗百科 <patrick <AT> gentoo <DOT> org>
5 CommitDate: Thu May 12 20:06:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124a43c9
7
8 dev-db/postgresql: Fix build with USE=llvm
9
10 Patch has been applied upstream, so it can be safely removed
11
12 Closes: https://bugs.gentoo.org/843935
13 Package-Manager: Portage-3.0.30, Repoman-3.0.3
14 Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
15
16 dev-db/postgresql/postgresql-12.11.ebuild | 1 -
17 dev-db/postgresql/postgresql-13.7.ebuild | 1 -
18 dev-db/postgresql/postgresql-14.3.ebuild | 1 -
19 3 files changed, 3 deletions(-)
20
21 diff --git a/dev-db/postgresql/postgresql-12.11.ebuild b/dev-db/postgresql/postgresql-12.11.ebuild
22 index b34da8d7f42d..d20fc1a60a7d 100644
23 --- a/dev-db/postgresql/postgresql-12.11.ebuild
24 +++ b/dev-db/postgresql/postgresql-12.11.ebuild
25 @@ -102,7 +102,6 @@ src_prepare() {
26 sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
27
28 use server || eapply "${FILESDIR}/${PN}-12.1-no-server.patch"
29 - use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
30
31 if use pam ; then
32 sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
33
34 diff --git a/dev-db/postgresql/postgresql-13.7.ebuild b/dev-db/postgresql/postgresql-13.7.ebuild
35 index 3ecf907af22e..0edc6e44eb96 100644
36 --- a/dev-db/postgresql/postgresql-13.7.ebuild
37 +++ b/dev-db/postgresql/postgresql-13.7.ebuild
38 @@ -104,7 +104,6 @@ src_prepare() {
39 sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
40
41 use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
42 - use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
43
44 if use pam ; then
45 sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
46
47 diff --git a/dev-db/postgresql/postgresql-14.3.ebuild b/dev-db/postgresql/postgresql-14.3.ebuild
48 index 669ad0e26b8a..c40034ddaf1b 100644
49 --- a/dev-db/postgresql/postgresql-14.3.ebuild
50 +++ b/dev-db/postgresql/postgresql-14.3.ebuild
51 @@ -100,7 +100,6 @@ src_prepare() {
52 sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
53
54 use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch"
55 - use llvm && eapply "${FILESDIR}/postgres-llvm14.patch"
56
57 if use pam ; then
58 sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \