Patchwork sane-backends: fix documentation build failure

login
register
mail settings
Submitter Gustavo Zacarias
Date Dec. 9, 2012, 2:35 p.m.
Message ID <1355063702-4716-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/204703/
State Accepted
Commit fc3a89d1cde8da2df17fdcc42289f330c2711d9b
Headers show

Comments

Gustavo Zacarias - Dec. 9, 2012, 2:35 p.m.
Disable documentation build, it seems to break with older
texlive/kpathsea versions, fixes:
http://autobuild.buildroot.net/results/44327b543d8918929bf252c5284e8691fda87fd0/
Also switch to alioth mirror since the original tarball is gone from the
regular site when 1.0.23 was released.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/sane-backends/sane-backends.mk |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Peter Korsgaard - Dec. 9, 2012, 8:39 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Disable documentation build, it seems to break with older
 Gustavo> texlive/kpathsea versions, fixes:
 Gustavo> http://autobuild.buildroot.net/results/44327b543d8918929bf252c5284e8691fda87fd0/
 Gustavo> Also switch to alioth mirror since the original tarball is
 Gustavo> gone from the regular site when 1.0.23 was released.

Did you have a look at moving to 1.0.23 instead?
Peter Korsgaard - Dec. 9, 2012, 8:59 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Disable documentation build, it seems to break with older
 Gustavo> texlive/kpathsea versions, fixes:
 Gustavo> http://autobuild.buildroot.net/results/44327b543d8918929bf252c5284e8691fda87fd0/
 Gustavo> Also switch to alioth mirror since the original tarball is
 Gustavo> gone from the regular site when 1.0.23 was released.

Committed, thanks.
Gustavo Zacarias - Dec. 9, 2012, 9:43 p.m.
On 12/09/2012 05:39 PM, Peter Korsgaard wrote:
> Did you have a look at moving to 1.0.23 instead?

Not really, i don't have a scanner handy for testing, so it would be
just a blind build test.
Also it's unlikely it would have fixed the documentation issue.
Regards.

Patch

diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 56ce82d..496dca4 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -5,7 +5,7 @@ 
 #############################################################
 SANE_BACKENDS_VERSION = 1.0.22
 SANE_BACKENDS_SOURCE = sane-backends-$(SANE_BACKENDS_VERSION).tar.gz
-SANE_BACKENDS_SITE = ftp://ftp2.sane-project.org/pub/sane/sane-backends-$(SANE_BACKENDS_VERSION)
+SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/3503
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 SANE_BACKENDS_DEPENDENCIES += libusb
@@ -37,4 +37,10 @@  else
 SANE_BACKENDS_CONF_OPT += --without-snmp
 endif
 
+define SANE_BACKENDS_DISABLE_DOCS
+	$(SED) 's/ doc//' $(@D)/Makefile
+endef
+
+SANE_BACKENDS_POST_CONFIGURE_HOOKS += SANE_BACKENDS_DISABLE_DOCS
+
 $(eval $(autotools-package))