diff --git a/extra/wpa_supplicant/build b/extra/wpa_supplicant/build index 71c0f6d0..fcb6c61b 100755 --- a/extra/wpa_supplicant/build +++ b/extra/wpa_supplicant/build @@ -3,16 +3,23 @@ # The wpa_supplicant package is built statically using # libnl-tiny which is a minimal version of libnl maintained # by OpenWRT. -make CC="$CC" ALL_LIBS=libnl-tiny.a -C libnl +mv libnl-tiny* libnl.tar.gz +tar xf libnl.tar.gz +mv libnl-tiny* libnl -# The CFLAGS must be set to link to the above locally built -# libnl-tiny library. -export CFLAGS="$CFLAGS -I$PWD/libnl/include -L$PWD/libnl -lnl-tiny" -export CFLAGS="$CFLAGS -static -D_GNU_SOURCE -DLIBNL1_COMPAT" +export CFLAGS="$CFLAGS -D_GNU_SOURCE -I$PWD/libnl/include" +export LDFLAGS="-L$PWD/libnl" + +( + cd libnl + + $CC $CFLAGS $CPPFLAGS -c ./*.c + ar rc libnl-tiny.a ./*.o +) cd wpa_supplicant -make LIBDIR=/usr/lib BINDIR=/usr/bin DRV_LIBS="$CFLAGS" +make LIBDIR=/usr/lib BINDIR=/usr/bin make LIBDIR=/usr/lib BINDIR=/usr/bin install mkdir -p \ diff --git a/extra/wpa_supplicant/checksums b/extra/wpa_supplicant/checksums index 1c53d1f7..2c293898 100644 --- a/extra/wpa_supplicant/checksums +++ b/extra/wpa_supplicant/checksums @@ -1,4 +1,4 @@ 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f -d2b57597b234c84b113e7640064c3273616c0bf086ad223d71f49aaea086ad59 +60c1ea251398be80667c3a77622abe862e2e1e61390e4484500351592f5f5e83 ea81361a44cede64fb42309e783f26ca1d0a4f6677a21550aad925b25405eeb0 edc95eac8695181682d22773d2d500a8b2dbe427632f342094365b235be47ff7 diff --git a/extra/wpa_supplicant/sources b/extra/wpa_supplicant/sources index 1c00b9e0..8491cbd2 100644 --- a/extra/wpa_supplicant/sources +++ b/extra/wpa_supplicant/sources @@ -1,4 +1,4 @@ https://w1.fi/releases/wpa_supplicant-VERSION.tar.gz -https://github.com/sabotage-linux/libnl-tiny/archive/4225e93bec5304abee3386213213718367e54a93.tar.gz libnl +https://git.openwrt.org/?p=project/libnl-tiny.git;a=snapshot;h=8e0555fb39f51a5d6436b4f1370850caa03611ea;sf=tgz files/.config wpa_supplicant files/wpa_supplicant.run wpa_supplicant diff --git a/extra/wpa_supplicant/version b/extra/wpa_supplicant/version index 05ed2945..40af9fc1 100644 --- a/extra/wpa_supplicant/version +++ b/extra/wpa_supplicant/version @@ -1 +1 @@ -2.10 1 +2.10 2