public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/files/, dev-util/pkgconf/
Date: Wed,  4 Aug 2021 19:47:48 +0000 (UTC)	[thread overview]
Message-ID: <1628106373.26896413cb8cad59dc57772b67a663a08a8d7eac.floppym@gentoo> (raw)

commit:     26896413cb8cad59dc57772b67a663a08a8d7eac
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  4 19:46:13 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Aug  4 19:46:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26896413

dev-util/pkgconf: drop obsolete darwin patch

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch | 24 ----------------------
 dev-util/pkgconf/pkgconf-1.7.4.ebuild              |  2 --
 dev-util/pkgconf/pkgconf-1.8.0.ebuild              |  2 --
 3 files changed, 28 deletions(-)

diff --git a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
deleted file mode 100644
index f41de43b97c..00000000000
--- a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-darwin9 does not malloc on NULL resolved_path
-
-https://github.com/pkgconf/pkgconf/pull/208
-
---- a/libpkgconf/path.c
-+++ b/libpkgconf/path.c
-@@ -92,15 +92,11 @@
- 			return;
- 		if (S_ISLNK(st.st_mode))
- 		{
--			char *linkdest = realpath(path, NULL);
-+			char pathbuf[PATH_MAX];
-+			char *linkdest = realpath(path, pathbuf);
- 
- 			if (linkdest != NULL && stat(linkdest, &st) == -1)
--			{
--				free(linkdest);
- 				return;
--			}
--
--			free(linkdest);
- 		}
- 		if (path_list_contains_entry(path, dirlist, &st))
- 			return;

diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
index 28f583d94f5..edfc4c30bd4 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(

diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
index 5be8ccdbf79..257e865e259 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(


             reply	other threads:[~2021-08-04 19:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-04 19:47 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-22 15:59 [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/files/, dev-util/pkgconf/ Sam James
2024-03-04 12:11 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1628106373.26896413cb8cad59dc57772b67a663a08a8d7eac.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox