Patchwork aircrack-ng: fix build failure and install path

login
register
mail settings
Submitter Gustavo Zacarias
Date May 5, 2013, 3:04 p.m.
Message ID <1367766265-23301-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/241518/
State Accepted
Commit 1ed86a07910dbd969390a23625d064256c4a694f
Headers show

Comments

Gustavo Zacarias - May 5, 2013, 3:04 p.m.
aircrack-ng doesn't account that openssl needs zlib so fix it.
Fixes:
http://autobuild.buildroot.net/results/97f4f90a7d60a0e3ea81c77f6986f1c1bae8d575/

Also fix the install prefix since it was getting installed to /usr/local

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/aircrack-ng/aircrack-ng.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
Peter Korsgaard - May 5, 2013, 7:09 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> aircrack-ng doesn't account that openssl needs zlib so fix it.
 Gustavo> Fixes:
 Gustavo> http://autobuild.buildroot.net/results/97f4f90a7d60a0e3ea81c77f6986f1c1bae8d575/

 Gustavo> Also fix the install prefix since it was getting installed to
 Gustavo> /usr/local

Committed, thanks.

Patch

diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index 48897da..c6574f1 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -21,18 +21,19 @@  else
 endif
 
 define AIRCRACK_NG_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)\
-		$(AIRCRACK_NG_MAKE_OPTS) all
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
+		LDFLAGS="$(TARGET_LDFLAGS) -lz" \
+		-C $(@D) $(AIRCRACK_NG_MAKE_OPTS) all
 endef
 
 define AIRCRACK_NG_CLEAN_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)\
-		$(AIRCRACK_NG_MAKE_OPTS) clean
+	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
+		-C $(@D) $(AIRCRACK_NG_MAKE_OPTS) clean
 endef
 
 define AIRCRACK_NG_INSTALL_TARGET_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) \
-		$(AIRCRACK_NG_MAKE_OPTS) install
+		prefix=/usr $(AIRCRACK_NG_MAKE_OPTS) install
 endef
 
 define AIRCRACK_NG_UNINSTALL_TARGET_CMDS