commit:     68545919747ad7b6ac2ca7681255f1371d0ed357
Author:     Ørjan Malde <red <AT> foxi <DOT> me>
AuthorDate: Fri Jan 15 17:58:35 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 11:53:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68545919

net-print/cups: drop bogus libtool install invocations

Closes: https://bugs.gentoo.org/765583
Signed-off-by: Ørjan Malde <red <AT> foxi.me>
Closes: https://github.com/gentoo/gentoo/pull/19069
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups/cups-2.3.3-r1.ebuild              |  1 +
 net-print/cups/files/cups-2.3.3-no-libtool.patch | 25 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/net-print/cups/cups-2.3.3-r1.ebuild 
b/net-print/cups/cups-2.3.3-r1.ebuild
index 1e397ff741c..d6375da0adf 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
        "${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"
+       "${FILESDIR}/${PN}-2.3.3-no-libtool.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/files/cups-2.3.3-no-libtool.patch 
b/net-print/cups/files/cups-2.3.3-no-libtool.patch
new file mode 100644
index 00000000000..cf891129418
--- /dev/null
+++ b/net-print/cups/files/cups-2.3.3-no-libtool.patch
@@ -0,0 +1,25 @@
+This is not needed and causes problems with more strict
+implementations of libtool.
+
+With slibtool it fails.
+
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -118,7 +118,7 @@ install-exec:      $(INSTALLXPC)
+       echo Installing backends in $(SERVERBIN)/backend
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+       for file in $(RBACKENDS); do \
+-              $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++              $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+       done
+       for file in $(UBACKENDS); do \
+               $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+@@ -142,7 +142,7 @@ install-exec:      $(INSTALLXPC)
+ install-xpc:  ipp
+       echo Installing XPC backends in $(SERVERBIN)/apple
+       $(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
+-      $(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple
++      $(INSTALL_BIN) ipp $(SERVERBIN)/apple
+       for file in $(IPPALIASES); do \
+               $(RM) $(SERVERBIN)/apple/$$file; \
+               $(LN) ipp $(SERVERBIN)/apple/$$file; \

Reply via email to