diff options
Diffstat (limited to 'meta/packages')
| -rw-r--r-- | meta/packages/networkmanager/files/makefile-fix.patch | 17 | ||||
| -rw-r--r-- | meta/packages/networkmanager/networkmanager_svn.bb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/meta/packages/networkmanager/files/makefile-fix.patch b/meta/packages/networkmanager/files/makefile-fix.patch new file mode 100644 index 000000000..5fbbf3a74 --- /dev/null +++ b/meta/packages/networkmanager/files/makefile-fix.patch @@ -0,0 +1,17 @@ +This line causes libtool to try and create a program which fails since there is no +main(). This is hidden with libtool 1.5.10 but appears with 2.2.2. + +RP - 14/4/08 + +Index: trunk/src/ppp-manager/Makefile.am +=================================================================== +--- trunk.orig/src/ppp-manager/Makefile.am 2008-04-14 23:00:54.000000000 +0100 ++++ trunk/src/ppp-manager/Makefile.am 2008-04-14 23:01:24.000000000 +0100 +@@ -25,7 +25,6 @@ + $(top_builddir)/src/marshallers/libmarshallers.la + + nm_pppd_plugindir = $(libdir) +-nm_pppd_plugin_PROGRAMS = nm-pppd-plugin.so + + nm_pppd_plugin_so_SOURCES = \ + nm-pppd-plugin.c \ diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb index d6e30732e..17052e034 100644 --- a/meta/packages/networkmanager/networkmanager_svn.bb +++ b/meta/packages/networkmanager/networkmanager_svn.bb @@ -7,10 +7,11 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" PV = "0.7+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ file://no-restarts.diff;patch=1;pnum=0 \ + file://makefile-fix.patch;patch=1 \ file://25NetworkManager \ file://99_networkmanager" |