From d25ca58aaf02c09f955e63223a512b693ed06433 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 12 Jun 2020 08:30:53 +0100 Subject: net-print/cups: respect user's AR Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich --- net-print/cups/cups-2.3.3-r1.ebuild | 1 + net-print/cups/files/cups-2.3.3-user-AR.patch | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 net-print/cups/files/cups-2.3.3-user-AR.patch (limited to 'net-print') diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild index 4ff03c7a6d4a..805de00b9089 100644 --- a/net-print/cups/cups-2.3.3-r1.ebuild +++ b/net-print/cups/cups-2.3.3-r1.ebuild @@ -81,6 +81,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.4.4-nostrip.patch" "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" + "${FILESDIR}/${PN}-2.3.3-user-AR.patch" ) MULTILIB_CHOST_TOOLS=( diff --git a/net-print/cups/files/cups-2.3.3-user-AR.patch b/net-print/cups/files/cups-2.3.3-user-AR.patch new file mode 100644 index 000000000000..0e52adb567d7 --- /dev/null +++ b/net-print/cups/files/cups-2.3.3-user-AR.patch @@ -0,0 +1,22 @@ +AC_PATH_PROG does not search tuple prefixes. +--- a/config-scripts/cups-common.m4 ++++ b/config-scripts/cups-common.m4 +@@ -37,15 +37,15 @@ AC_PROG_CC(clang cc gcc) + AC_PROG_CPP + AC_PROG_CXX(clang++ c++ g++) + AC_PROG_RANLIB +-AC_PATH_PROG(AR,ar) ++AC_CHECK_TOOL(AR,ar) + AC_PATH_PROG(CHMOD,chmod) + AC_PATH_PROG(GZIPPROG,gzip) + AC_MSG_CHECKING(for install-sh script) + INSTALL="`pwd`/install-sh" + AC_SUBST(INSTALL) + AC_MSG_RESULT(using $INSTALL) +-AC_PATH_PROG(LD,ld) +-AC_PATH_PROG(LN,ln) ++AC_CHECK_TOOL(LD,ld) ++AC_CHECK_TOOL(LN,ln) + AC_PATH_PROG(MKDIR,mkdir) + AC_PATH_PROG(MV,mv) + AC_PATH_PROG(RM,rm) -- cgit v1.2.3-65-gdbad