diff options
| author |   Philip Balister <philip@balister.org> | 2011-05-04 19:58:04 -0400 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2011-05-04 19:59:23 -0400 |
| commit | 73593c5b1c4d84cde5c8b5c17cde0ce9c7a89f7c (patch) | |
| tree | ae8271846004d795ca7dae0bed123c4e6fdf7b93 | |
| parent | 33ca9bebacad352437884027981d2374258819e5 (diff) | |
| download | openembedded-73593c5b1c4d84cde5c8b5c17cde0ce9c7a89f7c.tar.gz | |
networkmanager_git: fix build with static libnl1
* Fix flags for dns-manager also
Signed-off-by: Philip Balister <philip@balister.org>
3 files changed, 36 insertions, 3 deletions
diff --git a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch index a923da58cd..6560d7ca92 100644 --- a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch +++ b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch @@ -1,7 +1,7 @@ -From 9d6414375e2371086dcfadc1d117fbcfe43fb3fc Mon Sep 17 00:00:00 2001 +From 8b201faa65b23a1d2c3c1cedc80b40ba26e91be7 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 23 Mar 2011 17:27:54 +0100 -Subject: [PATCH] respect libnl flags also in backends/ip6-manager +Subject: [PATCH 1/2] respect libnl flags also in backends/ip6-manager Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- @@ -47,5 +47,5 @@ index b56b197..b98d6de 100644 $(GLIB_LIBS) -- -1.7.4.1 +1.7.3.4 diff --git a/recipes/networkmanager/networkmanager/0002-respect-libnl-flags-also-in-dns-manager.patch b/recipes/networkmanager/networkmanager/0002-respect-libnl-flags-also-in-dns-manager.patch new file mode 100644 index 0000000000..ede777fab3 --- /dev/null +++ b/recipes/networkmanager/networkmanager/0002-respect-libnl-flags-also-in-dns-manager.patch @@ -0,0 +1,32 @@ +From f7ff232d2c335eec5192b23861d8bfa2fd098425 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@opensdr.com> +Date: Wed, 4 May 2011 18:24:49 -0400 +Subject: [PATCH 2/2] respect-libnl-flags-also-in-dns-manager + +Signed-off-by: Philip Balister <philip@balister.org> +--- + src/dns-manager/Makefile.am | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am +index 7b5fc4f..b51f667 100644 +--- a/src/dns-manager/Makefile.am ++++ b/src/dns-manager/Makefile.am +@@ -19,12 +19,14 @@ libdns_manager_la_SOURCES = \ + nm-dns-utils.c + + libdns_manager_la_CPPFLAGS = \ ++ $(LIBNL_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DLOCALSTATEDIR=\"$(localstatedir)\" + + libdns_manager_la_LIBADD = \ + $(top_builddir)/src/logging/libnm-logging.la \ ++ $(LIBNL_LIBS) \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + +-- +1.7.3.4 + diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb index 81a2ad585b..8187787d11 100644 --- a/recipes/networkmanager/networkmanager_git.bb +++ b/recipes/networkmanager/networkmanager_git.bb @@ -20,6 +20,7 @@ SRC_URI += " \ file://NetworkManager \ file://gtk-doc.make \ file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \ + file://0002-respect-libnl-flags-also-in-dns-manager.patch \ " EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \ |