net-print/cups: disable unused host tools for cross-compiling

diff --git a/net-print/cups/cups-2.0.3.ebuild b/net-print/cups/cups-2.0.3.ebuild
index 11d2f6999b6faac532c2d13b536fb461dc13b5c3..1b14320d6ac8a41e1f8ef0106b8ae45209a1a0fb 100644 (file)
--- a/net-print/cups/cups-2.0.3.ebuild
+++ b/net-print/cups/cups-2.0.3.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+       "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/cups-2.0.4.ebuild b/net-print/cups/cups-2.0.4.ebuild
index 0a00f54ad5256abc2bf77d27e5d209331b16bfba..cd8a5f102a533562fd6f05bc5ce244dccf205c0a 100644 (file)
--- a/net-print/cups/cups-2.0.4.ebuild
+++ b/net-print/cups/cups-2.0.4.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+       "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/cups-2.1.2-r2.ebuild b/net-print/cups/cups-2.1.2-r2.ebuild
index 1a45172f5176d28f510a46b827661a8372d0ec23..49e827a2b14278566bd71f4d68c9f0df966d89c4 100644 (file)
--- a/net-print/cups/cups-2.1.2-r2.ebuild
+++ b/net-print/cups/cups-2.1.2-r2.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+       "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 45127ab418fe0401235dd9c54f465b3c0e969141..b22cf63b23920b1023ad96c4596073f888b9f9eb 100644 (file)
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
        "${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
        "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+       "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(

diff --git a/net-print/cups/files/cups-2.0.3-cross-compile.patch b/net-print/cups/files/cups-2.0.3-cross-compile.patch
new file mode 100644 (file)
index 0000000..d0893c3
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.3-cross-compile.patch
@@ -0,0 +1,30 @@
+we don't actually install the generated html output, so no point in building
+them.  this also helps cross-compiling because the tool to create the html
+uses $CC and has no logic for $BUILD_CC.  simpler to disable than fix.
+
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -73,7 +73,7 @@ MAN8 =       cupsaccept.$(MAN8EXT) \
+ # Make everything...
+ #
+ 
+-all:  $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
++all:  $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+ 
+ 
+ #
+
+similarly, the genstrings tool is used to gather all the translatable strings
+in the code base for passing to gettext.  in our builds, those strings already
+exist, so no point in running this tool.
+
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -70,7 +70,6 @@ EXECTARGETS =        \
+ TARGETS       =       \
+               $(LIBTARGETS) \
+               $(EXECTARGETS) \
+-              genstrings
+ 
+ 
+ #