010-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. From 1f3706d10812d70adefe32fe0d7d3a3ec25374f0 Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <hauke@hauke-m.de>
  3. Date: Sun, 21 Nov 2021 00:02:57 +0100
  4. Subject: Revert "iw: allow specifying CFLAGS/LIBS externally"
  5. This reverts commit 1325244b77d56fd7a16d1e35fdae0efc151920b1.
  6. The libreCMC build system provides the CFLAGS and LIBS names from the
  7. package Makefile to overwrite them for libnl-tiny. This is not possible
  8. after this upstream change which we revert here any more
  9. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  10. ---
  11. Makefile | 20 ++++++++++----------
  12. 1 file changed, 10 insertions(+), 10 deletions(-)
  13. --- a/Makefile
  14. +++ b/Makefile
  15. @@ -45,30 +45,30 @@ NLLIBNAME = libnl-1
  16. endif
  17. ifeq ($(NL2FOUND),Y)
  18. -override CFLAGS += -DCONFIG_LIBNL20
  19. -override LIBS += -lnl-genl
  20. +CFLAGS += -DCONFIG_LIBNL20
  21. +LIBS += -lnl-genl
  22. NLLIBNAME = libnl-2.0
  23. endif
  24. ifeq ($(NL3xFOUND),Y)
  25. # libnl 3.2 might be found as 3.2 and 3.0
  26. NL3FOUND = N
  27. -override CFLAGS += -DCONFIG_LIBNL30
  28. -override LIBS += -lnl-genl-3
  29. +CFLAGS += -DCONFIG_LIBNL30
  30. +LIBS += -lnl-genl-3
  31. NLLIBNAME = libnl-3.0
  32. endif
  33. ifeq ($(NL3FOUND),Y)
  34. -override CFLAGS += -DCONFIG_LIBNL30
  35. -override LIBS += -lnl-genl
  36. +CFLAGS += -DCONFIG_LIBNL30
  37. +LIBS += -lnl-genl
  38. NLLIBNAME = libnl-3.0
  39. endif
  40. # nl-3.1 has a broken libnl-gnl-3.1.pc file
  41. # as show by pkg-config --debug --libs --cflags --exact-version=3.1 libnl-genl-3.1;echo $?
  42. ifeq ($(NL31FOUND),Y)
  43. -override CFLAGS += -DCONFIG_LIBNL30
  44. -override LIBS += -lnl-genl
  45. +CFLAGS += -DCONFIG_LIBNL30
  46. +LIBS += -lnl-genl
  47. NLLIBNAME = libnl-3.1
  48. endif
  49. @@ -76,8 +76,8 @@ ifeq ($(NLLIBNAME),)
  50. $(error Cannot find development files for any supported version of libnl)
  51. endif
  52. -override LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
  53. -override CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
  54. +LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
  55. +CFLAGS += $(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
  56. endif # NO_PKG_CONFIG
  57. ifeq ($(V),1)