ports

morpheus ports
git clone git://git.2f30.org/ports.git
Log | Files | Refs | LICENSE

commit 2c09da1952751d5907b7502aa9f82034072263b8
parent f45cea9edd82cf9f27a2a396f294c6b364eddb4c
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri Jun 13 12:43:24 +0200

wpasupplicant, libnl3: small cleanup

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
libnl3/depsinc.mk | 4++--
libnl3/libnl3.mk | 4++--
wpasupplicant/wpasupplicant.mk | 16+++++++---------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/libnl3/depsinc.mk b/libnl3/depsinc.mk @@ -1,7 +1,7 @@ <$libnl3_DEPDIR/v.mk -libnl3_libdir = $libnl3_DEPDIR/libnl-$v/lib/.libs/ -libnl3_includedir = $libnl3_DEPDIR/libnl-$v/include +libnl3_libdir = ${libnl3_DEPDIR}/libnl-$v/lib/.libs/ +libnl3_includedir = ${libnl3_DEPDIR}/libnl-$v/include libnl3_cflags = -I${libnl3_includedir} libnl3_ldflags = -L${libnl3_libdir} diff --git a/libnl3/libnl3.mk b/libnl3/libnl3.mk @@ -6,6 +6,6 @@ libnl3:QV: ./configure \ --prefix="$PREFIX" \ --mandir="$ROOT/share/man" \ - --enable-shared=no \ - --enable-static=yes + --disable-shared \ + --enable-static make -j$nprocs diff --git a/wpasupplicant/wpasupplicant.mk b/wpasupplicant/wpasupplicant.mk @@ -1,22 +1,20 @@ TARG = wpasupplicant -DEPS = zlib openssl libnl3 +DEPS = openssl libnl3 zlib <$mkbuild/mk.common -INSTALL_BIN = wpa_supplicant/wpa_supplicant -# wpa_supplicant/wpa_cli wpa_supplicant/wpa_passphrase are also built +INSTALL_BIN = \ + wpa_supplicant/wpa_supplicant \ + wpa_supplicant/wpa_cli \ + wpa_supplicant/wpa_passphrase INSTALL_MAN8 = wpa_supplicant/doc/docbook/wpa_supplicant.8 -# INSTALL_MAN8 = `{ ls wpa_supplicant/doc/docbook/*.8 } wpasupplicant:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" # patch linux_wext.h (may use -D instead). sed -i 's/typedef __/typedef /g' src/drivers/linux_wext.h - #sed -i &#39;s/typedef __/typedef /g&#39; src/drivers/linux_wext.h cp ../dot.config wpa_supplicant/.config - # -lz at the right place. - sed -i '/^wpa_supplicant:/{N;s/$/ -lz/}' wpa_supplicant/Makefile - #sed -i &#39;/^wpa_supplicant:/{N;s/$/ -lz/}&#39; wpa_supplicant/Makefile - make -j$nprocs -C wpa_supplicant + # add -lz as extra libs. + make -j$nprocs -C wpa_supplicant EXTRALIBS="-lz"