Commit cb8b5c27 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/axfsutils: fix Makefile 



mkfs.axfs uses zlib, but does not have an rpath to our host dir.

That's because:
  - we're not passing our host CFLAGS or LDFLAGS
  - it is forcibly setting CFLAGS in the Makefile, overriding anything
    specified by the user
  - it is not using LDFLAGS at all

Add two patches so that CFLAGS and LDFLAGS from the environment are
used if present.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7caf4643

package/axfsutils/0001-fix-cflags.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Makefile: complement CFLAGS provided by the user



In some circumstances, the user may want to pass its own CFLAGS,

like for when the zlib headers are not located in the standard gcc

search paths.



Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>



diff -durN a/mkfs.axfs-legacy/Makefile b/mkfs.axfs-legacy/Makefile

--- a/mkfs.axfs-legacy/Makefile

+++ b/mkfs.axfs-legacy/Makefile

@@ -1,5 +1,5 @@

-INC = -I./

-CFLAGS = -g $(INC) -O0

+INC += -I./

+CFLAGS += -g $(INC) -O0

 

 MKFSOBJS = mkfs.axfs.o

package/axfsutils/0002-use-ldflags.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Makefile: use LDFLAGS as provided by the user



In some circumstances, the user may want to pass some LDFLAGS, like

-L flags to point to the zlib location if it was not installed in a

standard location.



Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>



diff -durN a/mkfs.axfs-legacy/Makefile b/mkfs.axfs-legacy/Makefile

--- a/mkfs.axfs-legacy/Makefile

+++ b/mkfs.axfs-legacy/Makefile

@@ -6,7 +6,7 @@

 all:   mkfs.axfs

 

 mkfs.axfs: $(MKFSOBJS)

-	$(CC) $(CFLAGS) -o mkfs.axfs $(MKFSOBJS) -lz

+	$(CC) $(CFLAGS) $(LDFLAGS) -o mkfs.axfs $(MKFSOBJS) -lz

 

 clean_mkfs.axfs:

 	rm -rf $(MKFSOBJS) mkfs.axfs

package/axfsutils/axfsutils.mk

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ AXFSUTILS_DEPENDENCIES = host-zlib 
# The 'new' mkfs.axfs version requires GNUstep which is not a buildroot

# prerequisite. The 'legacy' one works just as well without that requirement.

define HOST_AXFSUTILS_BUILD_CMDS

	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mkfs.axfs-legacy

	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/mkfs.axfs-legacy

endef



define HOST_AXFSUTILS_INSTALL_CMDS