Hi Thomas,

the patch attached to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546474
might be interesting to you. It looks like the current git master still uses the
inline specifier for nl_object_priv().

Afaics there is not upstream bug tracker for libnl, so I'm sending you this
directly in the hope that this patch will be uplied upstream.

Cheers,
Michael

-------- Original-Nachricht --------
Betreff: Bug#546474: 'inline' specifier in /usr/include/netlink/object.h
Weitersenden-Datum: Thu, 16 Jun 2011 18:33:05 +0000
Weitersenden-Von: Jamie Strandboge <ja...@ubuntu.com>
Weitersenden-An: debian-bugs-dist@lists.debian.org
Weitersenden-CC: Michael Biebl <bi...@debian.org>
Datum: Thu, 16 Jun 2011 13:31:31 -0500
Von: Jamie Strandboge <ja...@ubuntu.com>
Antwort an: Jamie Strandboge <ja...@ubuntu.com>, 546...@bugs.debian.org
An: Debian Bug Tracking System <546...@bugs.debian.org>

Package: libnl
Version: 1.1-6
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/patches/lp780044.patch: remove 'inline' for nl_object_priv() in
    include/netlink/object.h and lib/object.c (LP: #780044)

Thanks for considering the patch. References:
http://comments.gmane.org/gmane.comp.emulators.libvirt/37787
http://bugs.gentoo.org/show_bug.cgi?id=366561
https://bugs.launchpad.net/ubuntu/+source/libnl/+bug/780044


-- System Information:
Debian Release: squeeze/sid
  APT prefers natty
  APT policy: (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u libnl-1.1/debian/control libnl-1.1/debian/control
--- libnl-1.1/debian/control
+++ libnl-1.1/debian/control
@@ -1,7 +1,8 @@
 Source: libnl
 Section: net
 Priority: optional
-Maintainer: Michael Biebl <bi...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Biebl <bi...@debian.org>
 Build-Depends: debhelper (>= 7), cdbs, doxygen, texlive-latex-base, graphviz, ghostscript, quilt
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/libnl
diff -u libnl-1.1/debian/changelog libnl-1.1/debian/changelog
diff -u libnl-1.1/debian/patches/series libnl-1.1/debian/patches/series
--- libnl-1.1/debian/patches/series
+++ libnl-1.1/debian/patches/series
@@ -2,0 +3 @@
+lp780044.patch
only in patch2:
unchanged:
--- libnl-1.1.orig/debian/patches/lp780044.patch
+++ libnl-1.1/debian/patches/lp780044.patch
@@ -0,0 +1,30 @@
+Origin: http://bugs.gentoo.org/attachment.cgi?id=272585&action=diff
+Description: libnl headers incompatible with gcc -std=gnu99
+Ubuntu-Bug: https://launchpad.net/bugs/780044
+
+Index: libnl-1.1/include/netlink/object.h
+===================================================================
+--- libnl-1.1.orig/include/netlink/object.h	2011-06-16 13:15:28.000000000 -0500
++++ libnl-1.1/include/netlink/object.h	2011-06-16 13:16:22.000000000 -0500
+@@ -55,7 +55,7 @@
+ /* Access Functions */
+ extern int			nl_object_get_refcnt(struct nl_object *);
+ extern struct nl_cache *	nl_object_get_cache(struct nl_object *);
+-extern inline void *		nl_object_priv(struct nl_object *);
++extern void *			nl_object_priv(struct nl_object *);
+ 
+ #ifdef __cplusplus
+ }
+Index: libnl-1.1/lib/object.c
+===================================================================
+--- libnl-1.1.orig/lib/object.c	2011-06-16 13:16:55.000000000 -0500
++++ libnl-1.1/lib/object.c	2011-06-16 13:17:15.000000000 -0500
+@@ -376,7 +376,7 @@
+ 	return obj->ce_cache;
+ }
+ 
+-inline void *nl_object_priv(struct nl_object *obj)
++void *nl_object_priv(struct nl_object *obj)
+ {
+ 	return obj;
+ }

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to