/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.9.1.95-force-libnl1.1.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.9.1.95-force-libnl1.1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Sep 13 09:54:12 2012 UTC (22 months, 2 weeks ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump with various fixes. No longer saves thousands of temporary ipv6 routes (bug #428274, thanks to Matthias Nagel). No longer installs dispatcher and init scripts when USE=systemd to avoid annoying systemd users (bug #434692, thanks to Arne St├Ącker). Drop old.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

1 Build against libnl:1.1 only. Otherwise, networkmanager will link to
2 libnl-3.so and to libiWmxSdk (from wimax-1.5.2) which links to libnl.so,
3 and then explode spectacularly at runtime due to symbol collisions.
4
5 diff --git a/configure.ac b/configure.ac
6 index 75b9978..6761832 100644
7 --- a/configure.ac
8 +++ b/configure.ac
9 @@ -314,32 +314,13 @@ fi
10 AC_DEFINE_UNQUOTED(NO_CONSOLEKIT, $no_ck, [Define to disable use of ConsoleKit])
11
12 have_libnl="no"
13 -PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl3=yes], [have_libnl3=no])
14 -PKG_CHECK_MODULES(LIBNL_ROUTE3, libnl-route-3.0, [have_libnl_route3=yes], [have_libnl_route3=no])
15 -if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes"); then
16 - AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
17 - LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS"
18 - LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS"
19 - libnl_version="3"
20 +PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
21 +if (test "${have_libnl1}" = "yes"); then
22 + AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
23 + LIBNL_CFLAGS="$LIBNL1_CFLAGS"
24 + LIBNL_LIBS="$LIBNL1_LIBS"
25 + libnl_version="1"
26 have_libnl="yes"
27 -else
28 - PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no])
29 - if (test "${have_libnl2}" = "yes"); then
30 - AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 support])
31 - LIBNL_CFLAGS="$LIBNL2_CFLAGS"
32 - LIBNL_LIBS="$LIBNL2_LIBS"
33 - libnl_version="2"
34 - have_libnl="yes"
35 - else
36 - PKG_CHECK_MODULES(LIBNL1, libnl-1 >= 1.0-pre8, [have_libnl1=yes], [have_libnl1=no])
37 - if (test "${have_libnl1}" = "yes"); then
38 - AC_DEFINE(HAVE_LIBNL1, 1, [Define if you require libnl-1 legacy support])
39 - LIBNL_CFLAGS="$LIBNL1_CFLAGS"
40 - LIBNL_LIBS="$LIBNL1_LIBS"
41 - libnl_version="1"
42 - have_libnl="yes"
43 - fi
44 - fi
45 fi
46
47 if (test "${have_libnl}" = "no"); then

  ViewVC Help
Powered by ViewVC 1.1.20