NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/axfsutils: fix Makefile

Browse Source 
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: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2015-11-13 22:48:47 +01:00 committed by Peter Korsgaard
parent 7caf46439c
commit cb8b5c27b2
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/axfsutils/0001-fix-cflags.patch Normal file
View File

@ -0,0 +1,19 @@
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

20
package/axfsutils/0002-use-ldflags.patch Normal file
View File

@ -0,0 +1,20 @@
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

2
package/axfsutils/axfsutils.mk
View File

@ -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