diff mbox

fwup: disable documentation build

Message ID dcd45c085506be96cfcec71a7357ddeba84c2df3.1466511361.git.baruch@tkos.co.il
State Accepted
Commit 5d99eb3cef92fe1bd21b5e1347f0f93bdb2df5df
Headers show

Commit Message

Baruch Siach June 21, 2016, 12:16 p.m. UTC
Documentation build with help2man relies on the output of running 'fwup
--help'. That obviously can't work with cross compilation.

Fixes:
http://autobuild.buildroot.net/results/bdd/bdd8137973c37824f6aa9261ee307f6ed21b9166/
http://autobuild.buildroot.net/results/96a/96a53b3ec666bd09f09c8a3e5b31eff73e3dd0fa/
http://autobuild.buildroot.net/results/e0b/e0bcfaf9dd36d4992e507d18afeb1cec56048987/

Cc: Frank Hunleth <fhunleth@troodon-software.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/fwup/fwup.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Frank Hunleth June 21, 2016, 12:37 p.m. UTC | #1
Hi Baruch,

On Tue, Jun 21, 2016 at 8:16 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> Documentation build with help2man relies on the output of running 'fwup
> --help'. That obviously can't work with cross compilation.

Fwiw, there was a nearly identical patch a while ago that hasn't been
merged yet:

http://patchwork.ozlabs.org/patch/634937/

I prefer your commit comment, but I'm fine with whichever one gets
merged first. So,

Tested-by: Frank Hunleth <fhunleth@troodon-software.com>

Thanks,
Frank

>
> Fixes:
> http://autobuild.buildroot.net/results/bdd/bdd8137973c37824f6aa9261ee307f6ed21b9166/
> http://autobuild.buildroot.net/results/96a/96a53b3ec666bd09f09c8a3e5b31eff73e3dd0fa/
> http://autobuild.buildroot.net/results/e0b/e0bcfaf9dd36d4992e507d18afeb1cec56048987/
>
> Cc: Frank Hunleth <fhunleth@troodon-software.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/fwup/fwup.mk | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk
> index 7b007e1a9c8a..0a23856048b3 100644
> --- a/package/fwup/fwup.mk
> +++ b/package/fwup/fwup.mk
> @@ -10,6 +10,7 @@ FWUP_LICENSE = Apache-2.0
>  FWUP_LICENSE_FILES = LICENSE
>  FWUP_DEPENDENCIES = libconfuse libarchive libsodium
>  FWUP_AUTORECONF = YES
> +FWUP_CONF_ENV = ac_cv_path_HELP2MAN=""
>
>  $(eval $(autotools-package))
>  $(eval $(host-autotools-package))
> --
> 2.8.1
>
Peter Korsgaard June 21, 2016, 2:41 p.m. UTC | #2
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Documentation build with help2man relies on the output of running 'fwup
 > --help'. That obviously can't work with cross compilation.

 > Fixes:
 > http://autobuild.buildroot.net/results/bdd/bdd8137973c37824f6aa9261ee307f6ed21b9166/
 > http://autobuild.buildroot.net/results/96a/96a53b3ec666bd09f09c8a3e5b31eff73e3dd0fa/
 > http://autobuild.buildroot.net/results/e0b/e0bcfaf9dd36d4992e507d18afeb1cec56048987/

 > Cc: Frank Hunleth <fhunleth@troodon-software.com>
 > Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Committed, thanks.
Peter Korsgaard June 21, 2016, 2:43 p.m. UTC | #3
>>>>> "Frank" == Frank Hunleth <fhunleth@troodon-software.com> writes:

 > Hi Baruch,
 > On Tue, Jun 21, 2016 at 8:16 AM, Baruch Siach <baruch@tkos.co.il> wrote:
 >> Documentation build with help2man relies on the output of running 'fwup
 >> --help'. That obviously can't work with cross compilation.

 > Fwiw, there was a nearly identical patch a while ago that hasn't been
 > merged yet:

 > http://patchwork.ozlabs.org/patch/634937/

 > I prefer your commit comment, but I'm fine with whichever one gets
 > merged first. So,

 > Tested-by: Frank Hunleth <fhunleth@troodon-software.com>

Thanks. I've committed this and marked the earlier patch as superseeded.
diff mbox

Patch

diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk
index 7b007e1a9c8a..0a23856048b3 100644
--- a/package/fwup/fwup.mk
+++ b/package/fwup/fwup.mk
@@ -10,6 +10,7 @@  FWUP_LICENSE = Apache-2.0
 FWUP_LICENSE_FILES = LICENSE
 FWUP_DEPENDENCIES = libconfuse libarchive libsodium
 FWUP_AUTORECONF = YES
+FWUP_CONF_ENV = ac_cv_path_HELP2MAN=""
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))