From 1e8c1aa5752b38209bb521578377cd2025773e62 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 6 Apr 2024 16:34:38 +0200
Subject: sys-devel/binutils-config: fix -rpath and -L <arg> handling

A thinko broke skipping of arguments consisting of two entries,
resulting in very weird command lines.  Not noticed on Darwin because
for some odd reason.

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
---
 .../binutils-config/binutils-config-5.1-r11.ebuild | 85 ----------------------
 .../binutils-config/binutils-config-5.1-r12.ebuild | 85 ++++++++++++++++++++++
 sys-devel/binutils-config/files/ldwrapper.c        | 22 ++++--
 3 files changed, 100 insertions(+), 92 deletions(-)
 delete mode 100644 sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
 create mode 100644 sys-devel/binutils-config/binutils-config-5.1-r12.ebuild

diff --git a/sys-devel/binutils-config/binutils-config-5.1-r11.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
deleted file mode 100644
index 38f82d40b5..0000000000
--- a/sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils prefix
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://www.gentoo.org/"
-WRAPPER_REV="${PV%%.*}.3.4"
-#SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/sys-devel/binutils-config/files/ldwrapper.c?id=${GIT_REV} -> ${PN}-ldwrapper-${WRAPPER_REV}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions
-	!<app-admin/eselect-1.4.5"
-
-S=${WORKDIR}
-
-# NOTE: the ld wrapper is only enabled on rpath versions of prefix.
-src_prepare() {
-	cp "${FILESDIR}"/${PN}-${PV} ./${PN} || die
-	cp "${FILESDIR}"/ldwrapper.c ./${PN}-ldwrapper-${WRAPPER_REV}.c || die
-	if use prefix-guest; then
-		epatch "${FILESDIR}/${PN}-5-ldwrapper.patch"
-	fi
-	eprefixify ${PN}
-	eapply_user
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	use prefix-guest || return
-	local extraargs=( )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		extraargs+=(
-			-DDARWIN_LD_DEFAULT_TARGET='"'${MACOSX_DEPLOYMENT_TARGET}'"'
-		)
-	fi
-	local args=(
-		$(tc-getCC)
-		${CPPFLAGS}
-		${CFLAGS}
-		-Wall
-		-o ldwrapper ${PN}-ldwrapper-${WRAPPER_REV}.c
-		-DEPREFIX=\"${EPREFIX}\"
-		-DCHOST=\"${CHOST}\"
-		"${extraargs[@]}"
-		${LDFLAGS}
-	)
-	echo ${args[*]}
-	"${args[@]}" || die
-}
-
-src_install() {
-	dobin ${PN}
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-
-	dodir /usr/$(get_libdir)/misc/binutils-config
-	mv "${S}"/ldwrapper "${ED}"/usr/$(get_libdir)/misc/binutils-config/
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/binutils.eselect
-}
-
-pkg_preinst() {
-	# Force a refresh when upgrading from an older version that symlinked
-	# in all the libs & includes that binutils-libs handles. #528088
-	if has_version "<${CATEGORY}/${PN}-5" ; then
-		local bc current
-		bc="${ED}/usr/bin/binutils-config"
-		if current=$("${bc}" -c) ; then
-			"${bc}" "${current}"
-		fi
-	fi
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
new file mode 100644
index 0000000000..38f82d40b5
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils prefix
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="https://www.gentoo.org/"
+WRAPPER_REV="${PV%%.*}.3.4"
+#SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/sys-devel/binutils-config/files/ldwrapper.c?id=${GIT_REV} -> ${PN}-ldwrapper-${WRAPPER_REV}.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+# We also RDEPEND on sys-apps/findutils which is in base @system
+RDEPEND="sys-apps/gentoo-functions
+	!<app-admin/eselect-1.4.5"
+
+S=${WORKDIR}
+
+# NOTE: the ld wrapper is only enabled on rpath versions of prefix.
+src_prepare() {
+	cp "${FILESDIR}"/${PN}-${PV} ./${PN} || die
+	cp "${FILESDIR}"/ldwrapper.c ./${PN}-ldwrapper-${WRAPPER_REV}.c || die
+	if use prefix-guest; then
+		epatch "${FILESDIR}/${PN}-5-ldwrapper.patch"
+	fi
+	eprefixify ${PN}
+	eapply_user
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	use prefix-guest || return
+	local extraargs=( )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		extraargs+=(
+			-DDARWIN_LD_DEFAULT_TARGET='"'${MACOSX_DEPLOYMENT_TARGET}'"'
+		)
+	fi
+	local args=(
+		$(tc-getCC)
+		${CPPFLAGS}
+		${CFLAGS}
+		-Wall
+		-o ldwrapper ${PN}-ldwrapper-${WRAPPER_REV}.c
+		-DEPREFIX=\"${EPREFIX}\"
+		-DCHOST=\"${CHOST}\"
+		"${extraargs[@]}"
+		${LDFLAGS}
+	)
+	echo ${args[*]}
+	"${args[@]}" || die
+}
+
+src_install() {
+	dobin ${PN}
+	use prefix && eprefixify "${ED}"/usr/bin/${PN}
+	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
+	doman "${FILESDIR}"/${PN}.8
+
+	dodir /usr/$(get_libdir)/misc/binutils-config
+	mv "${S}"/ldwrapper "${ED}"/usr/$(get_libdir)/misc/binutils-config/
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/binutils.eselect
+}
+
+pkg_preinst() {
+	# Force a refresh when upgrading from an older version that symlinked
+	# in all the libs & includes that binutils-libs handles. #528088
+	if has_version "<${CATEGORY}/${PN}-5" ; then
+		local bc current
+		bc="${ED}/usr/bin/binutils-config"
+		if current=$("${bc}" -c) ; then
+			"${bc}" "${current}"
+		fi
+	fi
+}
diff --git a/sys-devel/binutils-config/files/ldwrapper.c b/sys-devel/binutils-config/files/ldwrapper.c
index 22fbf9aba8..1aa96537d0 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -530,7 +530,7 @@ main(int argc, char *argv[])
 			char *path;
 			int pth;
 			char duplicate;
-			int before = j - 1;
+			int nexti = i;
 
 			/* arguments can be in many ways here:
 			 * -L<path>
@@ -541,10 +541,11 @@ main(int argc, char *argv[])
 			while (*path != '\0' && isspace(*path))
 				path++;
 			if (*path == '\0') {
+				nexti++;
 				/* no more arguments?!? skip */
-				if (i + 1 >= argc)
+				if (nexti >= argc)
 					continue;
-				path = argv[i + 1];
+				path = argv[nexti];
 				while (*path != '\0' && isspace(*path))
 					path++;
 			}
@@ -570,7 +571,8 @@ main(int argc, char *argv[])
 					}
 				}
 				if (duplicate) {
-					j = before;
+					i = nexti;
+					j--;
 					continue;
 				}
 				/* record path */
@@ -584,7 +586,8 @@ main(int argc, char *argv[])
 					}
 				}
 				if (duplicate) {
-					j = before;
+					i = nexti;
+					j--;
 					continue;
 				}
 				/* record path */
@@ -597,8 +600,12 @@ main(int argc, char *argv[])
 			char *path;
 			int pth;
 			char duplicate;
+			int nexti = i + 1;
 
-			path = argv[i + 1];
+			/* no more arguments?!? skip */
+			if (nexti >= argc)
+				continue;
+			path = argv[nexti];
 			while (*path != '\0' && isspace(*path))
 				path++;
 			/* not absolute (or empty)?!? skip */
@@ -617,7 +624,8 @@ main(int argc, char *argv[])
 				}
 			}
 			if (duplicate) {
-				j -= 2;
+				j--;
+				i = nexti;
 				continue;
 			}
 			/* record path */
-- 
cgit v1.2.3-65-gdbad