All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/ushare: fix NLS build
@ 2021-08-28  7:13 Fabrice Fontaine
  2021-08-28 13:50 ` Arnout Vandecappelle
  2021-09-07 13:00 ` Peter Korsgaard
  0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-08-28  7:13 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Commit c4e1a075101914f8e0d47f8bb9c06bea13ba0fd2 forgot to add
--enable-nls to patch resulting in the following build failure:

Unknown option "--enable-nls".

Fixes:
 - http://autobuild.buildroot.org/results/6ab2555b419355f01310f230fe612f2a3699bbfd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...-t-build-po-files-if-NLS-is-disabled.patch | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
index f0fa89998f..3fbda2838e 100644
--- a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
+++ b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
@@ -1,4 +1,4 @@
-From 977171781f5d49e61b46c0241fb67cbb7d666498 Mon Sep 17 00:00:00 2001
+From c9f5783bb2df4a19c6281daeda30e8ab905d2ca3 Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Date: Sun, 22 Aug 2021 10:44:48 +0200
 Subject: [PATCH] Don't build po files if NLS is disabled
@@ -7,8 +7,8 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 [Upstream status: https://github.com/ddugovic/uShare/pull/12]
 ---
  Makefile  | 7 +++++--
- configure | 1 +
- 2 files changed, 6 insertions(+), 2 deletions(-)
+ configure | 3 +++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index ebd8f91..6686cfd 100644
@@ -31,10 +31,19 @@ index ebd8f91..6686cfd 100644
  	for subdir in $(SUBDIRS); do \
  	  $(MAKE) -C $$subdir $@; \
 diff --git a/configure b/configure
-index 4a3efe0..162a776 100755
+index 4a3efe0..f48806a 100755
 --- a/configure
 +++ b/configure
-@@ -723,6 +723,7 @@ append_config "LDFLAGS=$LDFLAGS"
+@@ -414,6 +414,8 @@ for opt do
+   ;;
+   --with-libdlna-dir=*) libdlnadir="$optval";
+   ;;
++  --enable-nls) nls="yes"
++  ;;
+   --disable-nls) nls="no"
+   ;;
+   --enable-dlna) dlna="yes"
+@@ -723,6 +725,7 @@ append_config "LDFLAGS=$LDFLAGS"
  append_config "INSTALL=$INSTALL"
  
  append_config "DEBUG=$debug"
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ushare: fix NLS build
  2021-08-28  7:13 [Buildroot] [PATCH 1/1] package/ushare: fix NLS build Fabrice Fontaine
@ 2021-08-28 13:50 ` Arnout Vandecappelle
  2021-08-28 14:27   ` Fabrice Fontaine
  2021-09-07 13:00 ` Peter Korsgaard
  1 sibling, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-08-28 13:50 UTC (permalink / raw)
  To: Fabrice Fontaine, buildroot



On 28/08/2021 09:13, Fabrice Fontaine wrote:
> Commit c4e1a075101914f8e0d47f8bb9c06bea13ba0fd2 forgot to add
> --enable-nls to patch resulting in the following build failure:
> 
> Unknown option "--enable-nls".
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/6ab2555b419355f01310f230fe612f2a3699bbfd
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

 Applied to master, thanks.

 Has the patch been updated upstream?

 Regards,
 Arnout

> ---
>  ...-t-build-po-files-if-NLS-is-disabled.patch | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
> 
> diff --git a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
> index f0fa89998f..3fbda2838e 100644
> --- a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
> +++ b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
> @@ -1,4 +1,4 @@
> -From 977171781f5d49e61b46c0241fb67cbb7d666498 Mon Sep 17 00:00:00 2001
> +From c9f5783bb2df4a19c6281daeda30e8ab905d2ca3 Mon Sep 17 00:00:00 2001
>  From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>  Date: Sun, 22 Aug 2021 10:44:48 +0200
>  Subject: [PATCH] Don't build po files if NLS is disabled
> @@ -7,8 +7,8 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>  [Upstream status: https://github.com/ddugovic/uShare/pull/12]
>  ---
>   Makefile  | 7 +++++--
> - configure | 1 +
> - 2 files changed, 6 insertions(+), 2 deletions(-)
> + configure | 3 +++
> + 2 files changed, 8 insertions(+), 2 deletions(-)
>  
>  diff --git a/Makefile b/Makefile
>  index ebd8f91..6686cfd 100644
> @@ -31,10 +31,19 @@ index ebd8f91..6686cfd 100644
>   	for subdir in $(SUBDIRS); do \
>   	  $(MAKE) -C $$subdir $@; \
>  diff --git a/configure b/configure
> -index 4a3efe0..162a776 100755
> +index 4a3efe0..f48806a 100755
>  --- a/configure
>  +++ b/configure
> -@@ -723,6 +723,7 @@ append_config "LDFLAGS=$LDFLAGS"
> +@@ -414,6 +414,8 @@ for opt do
> +   ;;
> +   --with-libdlna-dir=*) libdlnadir="$optval";
> +   ;;
> ++  --enable-nls) nls="yes"
> ++  ;;
> +   --disable-nls) nls="no"
> +   ;;
> +   --enable-dlna) dlna="yes"
> +@@ -723,6 +725,7 @@ append_config "LDFLAGS=$LDFLAGS"
>   append_config "INSTALL=$INSTALL"
>   
>   append_config "DEBUG=$debug"
> 
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ushare: fix NLS build
  2021-08-28 13:50 ` Arnout Vandecappelle
@ 2021-08-28 14:27   ` Fabrice Fontaine
  0 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-08-28 14:27 UTC (permalink / raw)
  To: Arnout Vandecappelle; +Cc: Buildroot Mailing List

Le sam. 28 août 2021 à 15:50, Arnout Vandecappelle <arnout@mind.be> a écrit :
>
>
>
> On 28/08/2021 09:13, Fabrice Fontaine wrote:
> > Commit c4e1a075101914f8e0d47f8bb9c06bea13ba0fd2 forgot to add
> > --enable-nls to patch resulting in the following build failure:
> >
> > Unknown option "--enable-nls".
> >
> > Fixes:
> >  - http://autobuild.buildroot.org/results/6ab2555b419355f01310f230fe612f2a3699bbfd
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
>  Applied to master, thanks.
>
>  Has the patch been updated upstream?
Yes and I merged it:
https://github.com/ddugovic/uShare/commit/201621cf71ce9cd16f699471c343ac10513fdee7
>
>  Regards,
>  Arnout
>
> > ---
> >  ...-t-build-po-files-if-NLS-is-disabled.patch | 19 ++++++++++++++-----
> >  1 file changed, 14 insertions(+), 5 deletions(-)
> >
> > diff --git a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
> > index f0fa89998f..3fbda2838e 100644
> > --- a/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
> > +++ b/package/ushare/0001-Don-t-build-po-files-if-NLS-is-disabled.patch
> > @@ -1,4 +1,4 @@
> > -From 977171781f5d49e61b46c0241fb67cbb7d666498 Mon Sep 17 00:00:00 2001
> > +From c9f5783bb2df4a19c6281daeda30e8ab905d2ca3 Mon Sep 17 00:00:00 2001
> >  From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> >  Date: Sun, 22 Aug 2021 10:44:48 +0200
> >  Subject: [PATCH] Don't build po files if NLS is disabled
> > @@ -7,8 +7,8 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> >  [Upstream status: https://github.com/ddugovic/uShare/pull/12]
> >  ---
> >   Makefile  | 7 +++++--
> > - configure | 1 +
> > - 2 files changed, 6 insertions(+), 2 deletions(-)
> > + configure | 3 +++
> > + 2 files changed, 8 insertions(+), 2 deletions(-)
> >
> >  diff --git a/Makefile b/Makefile
> >  index ebd8f91..6686cfd 100644
> > @@ -31,10 +31,19 @@ index ebd8f91..6686cfd 100644
> >       for subdir in $(SUBDIRS); do \
> >         $(MAKE) -C $$subdir $@; \
> >  diff --git a/configure b/configure
> > -index 4a3efe0..162a776 100755
> > +index 4a3efe0..f48806a 100755
> >  --- a/configure
> >  +++ b/configure
> > -@@ -723,6 +723,7 @@ append_config "LDFLAGS=$LDFLAGS"
> > +@@ -414,6 +414,8 @@ for opt do
> > +   ;;
> > +   --with-libdlna-dir=*) libdlnadir="$optval";
> > +   ;;
> > ++  --enable-nls) nls="yes"
> > ++  ;;
> > +   --disable-nls) nls="no"
> > +   ;;
> > +   --enable-dlna) dlna="yes"
> > +@@ -723,6 +725,7 @@ append_config "LDFLAGS=$LDFLAGS"
> >   append_config "INSTALL=$INSTALL"
> >
> >   append_config "DEBUG=$debug"
> >
Best Regards,

Fabrice
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ushare: fix NLS build
  2021-08-28  7:13 [Buildroot] [PATCH 1/1] package/ushare: fix NLS build Fabrice Fontaine
  2021-08-28 13:50 ` Arnout Vandecappelle
@ 2021-09-07 13:00 ` Peter Korsgaard
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2021-09-07 13:00 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Commit c4e1a075101914f8e0d47f8bb9c06bea13ba0fd2 forgot to add
 > --enable-nls to patch resulting in the following build failure:

 > Unknown option "--enable-nls".

 > Fixes:
 >  - http://autobuild.buildroot.org/results/6ab2555b419355f01310f230fe612f2a3699bbfd

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-07 13:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-28  7:13 [Buildroot] [PATCH 1/1] package/ushare: fix NLS build Fabrice Fontaine
2021-08-28 13:50 ` Arnout Vandecappelle
2021-08-28 14:27   ` Fabrice Fontaine
2021-09-07 13:00 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.