Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/, dev-util/pkgconf/files/
Date: Fri, 08 Jan 2021 10:08:05
Message-Id: 1610100479.08889d5fcd75867abec7c2dc201a1323fbb735be.grobian@gentoo
1 commit: 08889d5fcd75867abec7c2dc201a1323fbb735be
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 8 10:06:19 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 8 10:07:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08889d5f
7
8 dev-util/pkgconf-1.7.3-r1: add fix for ppc-macos
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch | 24 ++++++++++++++++++++++
14 dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild | 2 ++
15 2 files changed, 26 insertions(+)
16
17 diff --git a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
18 new file mode 100644
19 index 00000000000..f41de43b97c
20 --- /dev/null
21 +++ b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
22 @@ -0,0 +1,24 @@
23 +darwin9 does not malloc on NULL resolved_path
24 +
25 +https://github.com/pkgconf/pkgconf/pull/208
26 +
27 +--- a/libpkgconf/path.c
28 ++++ b/libpkgconf/path.c
29 +@@ -92,15 +92,11 @@
30 + return;
31 + if (S_ISLNK(st.st_mode))
32 + {
33 +- char *linkdest = realpath(path, NULL);
34 ++ char pathbuf[PATH_MAX];
35 ++ char *linkdest = realpath(path, pathbuf);
36 +
37 + if (linkdest != NULL && stat(linkdest, &st) == -1)
38 +- {
39 +- free(linkdest);
40 + return;
41 +- }
42 +-
43 +- free(linkdest);
44 + }
45 + if (path_list_contains_entry(path, dirlist, &st))
46 + return;
47
48 diff --git a/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
49 index 257e865e259..3923dd6417e 100644
50 --- a/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
51 +++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
52 @@ -40,6 +40,8 @@ MULTILIB_CHOST_TOOLS=(
53 src_prepare() {
54 default
55
56 + [[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
57 +
58 [[ ${PV} == "9999" ]] && eautoreconf
59 if use pkg-config; then
60 MULTILIB_CHOST_TOOLS+=(