summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØrjan Malde <red@foxi.me>2021-01-15 18:58:35 +0100
committerLars Wendler <polynomial-c@gentoo.org>2021-01-16 12:53:15 +0100
commit68545919747ad7b6ac2ca7681255f1371d0ed357 (patch)
tree6d50f3b9c5c8601ae0eed46df09f1ea86c870425 /net-print/cups
parentmedia-plugins/hdx-realtime-media-engine: Revbump fixing several issues (diff)
downloadgentoo-68545919747ad7b6ac2ca7681255f1371d0ed357.tar.gz
gentoo-68545919747ad7b6ac2ca7681255f1371d0ed357.tar.bz2
gentoo-68545919747ad7b6ac2ca7681255f1371d0ed357.zip
net-print/cups: drop bogus libtool install invocations
Closes: https://bugs.gentoo.org/765583 Signed-off-by: Ørjan Malde <red@foxi.me> Closes: https://github.com/gentoo/gentoo/pull/19069 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/cups-2.3.3-r1.ebuild1
-rw-r--r--net-print/cups/files/cups-2.3.3-no-libtool.patch25
2 files changed, 26 insertions, 0 deletions
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; \