Patchwork wpa-supplicant: fix for dso link change

login
register
mail settings
Submitter Fahad Usman
Date July 12, 2012, 3:25 p.m.
Message ID <1342106726-24050-1-git-send-email-fahad_usman@mentor.com>
Download mbox | patch
Permalink /patch/31805/
State Not Applicable, archived
Headers show

Comments

Fahad Usman - July 12, 2012, 3:25 p.m.
* add lgpg-error to LIBS explicitly in order to to make it work with the
updated dso linking behavior in newer versions of binutils

Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
---
 .../wpa-supplicant-0.7.3/dso-link-change.patch     |   13 +++++++++++++
 .../wpa-supplicant/wpa-supplicant-0.7.inc          |    3 ++-
 .../wpa-supplicant/wpa-supplicant_0.7.3.bb         |    2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/dso-link-change.patch

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/dso-link-change.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/dso-link-change.patch
new file mode 100644
index 0000000..1903d1f
--- /dev/null
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/dso-link-change.patch
@@ -0,0 +1,13 @@ 
+--- wpa_supplicant/Makefile
++++ wpa_supplicant/Makefile
+@@ -768,8 +768,8 @@ OBJS_p += ../src/crypto/crypto_gnutls.o
+ ifdef NEED_FIPS186_2_PRF
+ OBJS += ../src/crypto/fips_prf_gnutls.o
+ endif
+-LIBS += -lgcrypt
+-LIBS_p += -lgcrypt
++LIBS += -lgcrypt -lgpg-error
++LIBS_p += -lgcrypt -lgpg-error
+ CONFIG_INTERNAL_SHA256=y
+ CONFIG_INTERNAL_RC4=y
+ CONFIG_INTERNAL_DH_GROUP5=y
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index 6c84202..430f7fa 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -14,7 +14,8 @@  SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
            file://wpa-supplicant.sh \
            file://wpa_supplicant.conf \
            file://wpa_supplicant.conf-sane \
-           file://99_wpa_supplicant"
+           file://99_wpa_supplicant \
+           file://dso-link-change.patch"
 
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 6f6378b..7521bbe 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@ 
 require wpa-supplicant-0.7.inc
 
-PR = "r12"
+PR = "r13"
 
 SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
 SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"