diff mbox series

[1/2] package/feh: Fix build issue with some older cross-compilers

Message ID 20171115115155.4830-1-petr.vorel@gmail.com
State Superseded
Headers show
Series [1/2] package/feh: Fix build issue with some older cross-compilers | expand

Commit Message

Petr Vorel Nov. 15, 2017, 11:51 a.m. UTC
by adding -std=gnu11 to CFLAGS.

Also: build in parallel, use TARGET_CONFIGURE_OPTS and cleanup
FEH_INSTALL_TARGET_CMDS.

Fixes:
http://autobuild.buildroot.net/results/94527fcd70fa85298c366537013c939534beead0/
http://autobuild.buildroot.net/results/bf31199cdaa18971a9b599c26fbefac73b2d6f30/
http://autobuild.buildroot.net/results/5b65c305b50664e02d5f8022278055c80739342d/
http://autobuild.buildroot.net/results/ed3b9fb8d09cd677af4b8825566877c552926ae5/

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 package/feh/feh.mk | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Baruch Siach Nov. 15, 2017, 12:41 p.m. UTC | #1
Hi Petr,

How did you overcome the build issue you had?

On Wed, Nov 15, 2017 at 12:51:54PM +0100, Petr Vorel wrote:
> by adding -std=gnu11 to CFLAGS.
> 
> Also: build in parallel, use TARGET_CONFIGURE_OPTS and cleanup
> FEH_INSTALL_TARGET_CMDS.

This should be a separate patch, I think.

baruch

> Fixes:
> http://autobuild.buildroot.net/results/94527fcd70fa85298c366537013c939534beead0/
> http://autobuild.buildroot.net/results/bf31199cdaa18971a9b599c26fbefac73b2d6f30/
> http://autobuild.buildroot.net/results/5b65c305b50664e02d5f8022278055c80739342d/
> http://autobuild.buildroot.net/results/ed3b9fb8d09cd677af4b8825566877c552926ae5/
> 
> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
>  package/feh/feh.mk | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/package/feh/feh.mk b/package/feh/feh.mk
> index 3f4c410440..e0ca21b9ca 100644
> --- a/package/feh/feh.mk
> +++ b/package/feh/feh.mk
> @@ -12,13 +12,12 @@ FEH_LICENSE = MIT
>  FEH_LICENSE_FILES = COPYING
>  
>  define FEH_BUILD_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
> -		-C $(@D) all
> +	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu11" \
> +		$(MAKE) -C $(@D) all
>  endef
>  
>  define FEH_INSTALL_TARGET_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \
> -		PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
> +	$(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
>  endef
>  
>  $(eval $(generic-package))
Petr Vorel Nov. 15, 2017, 12:48 p.m. UTC | #2
Hi Baruch,

> Hi Petr,

> How did you overcome the build issue you had?
Build on another machine with Debian. I'll write about it in the original thread (and CC
you and.

> On Wed, Nov 15, 2017 at 12:51:54PM +0100, Petr Vorel wrote:
> > by adding -std=gnu11 to CFLAGS.

> > Also: build in parallel, use TARGET_CONFIGURE_OPTS and cleanup
> > FEH_INSTALL_TARGET_CMDS.

> This should be a separate patch, I think.
I don't like squashing things in one commit either, but this looked obvious to me. OK,
I'll split it.


Kind regards,
Petr
Baruch Siach Nov. 15, 2017, 12:54 p.m. UTC | #3
Hi Petr,

On Wed, Nov 15, 2017 at 01:48:01PM +0100, Petr Vorel wrote:
> Hi Baruch,
> > How did you overcome the build issue you had?
> Build on another machine with Debian. I'll write about it in the original thread (and CC
> you and.
> 
> > On Wed, Nov 15, 2017 at 12:51:54PM +0100, Petr Vorel wrote:
> > > by adding -std=gnu11 to CFLAGS.
> 
> > > Also: build in parallel, use TARGET_CONFIGURE_OPTS and cleanup
> > > FEH_INSTALL_TARGET_CMDS.
> 
> > This should be a separate patch, I think.
> I don't like squashing things in one commit either, but this looked obvious to me. OK,
> I'll split it.

Apart from keeping separate changes in separate patches, I think we'd like to 
have the fix in master, but the cleanup in next.

baruch
diff mbox series

Patch

diff --git a/package/feh/feh.mk b/package/feh/feh.mk
index 3f4c410440..e0ca21b9ca 100644
--- a/package/feh/feh.mk
+++ b/package/feh/feh.mk
@@ -12,13 +12,12 @@  FEH_LICENSE = MIT
 FEH_LICENSE_FILES = COPYING
 
 define FEH_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-		-C $(@D) all
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu11" \
+		$(MAKE) -C $(@D) all
 endef
 
 define FEH_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \
-		PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
 $(eval $(generic-package))