Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 174048 Details for
Bug 233326
net-misc/dhcpv6 + linux-headers-2.6.25-r4 - /usr/include/linux/ipv6.h:18: error: redefinition of 'struct in6_pktinfo'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix-gnusource-collisions.patch
fix-gnusource-collisions.patch (text/plain), 3.37 KB, created by
Conrad Kostecki
on 2008-12-02 07:58:58 UTC
(
hide
)
Description:
fix-gnusource-collisions.patch
Filename:
MIME Type:
Creator:
Conrad Kostecki
Created:
2008-12-02 07:58:58 UTC
Size:
3.37 KB
patch
obsolete
>--- dhcpv6-1.0.22.orig/src/dhcp6c.c 2008-12-02 08:40:48.148706045 +0100 >+++ dhcpv6-1.0.22/src/dhcp6c.c 2008-12-02 08:43:49.708699325 +0100 >@@ -74,6 +74,10 @@ > # include <netinet6/in6_var.h> > #endif > >+#ifdef HAVE_LINUX_IPV6_H >+# include <linux/ipv6.h> >+#endif >+ > #include <linux/netlink.h> > #include <netlink/socket.h> > #include <netlink/route/rtnl.h> >--- dhcpv6-1.0.22.orig/src/dhcp6s.c 2008-12-02 08:40:48.158710880 +0100 >+++ dhcpv6-1.0.22/src/dhcp6s.c 2008-12-02 08:45:42.458702955 +0100 >@@ -62,6 +62,10 @@ > # include <linux/sockios.h> > #endif > >+#ifdef HAVE_LINUX_IPV6_H >+# include <linux/ipv6.h> >+#endif >+ > #include "dhcp6.h" > #include "cfg.h" > #include "common.h" >--- dhcpv6-1.0.22.orig/src/Makefile.am 2008-12-02 08:40:48.158710880 +0100 >+++ dhcpv6-1.0.22/src/Makefile.am 2008-12-02 08:48:15.518699531 +0100 >@@ -25,21 +25,21 @@ > > lib_LTLIBRARIES = libdhcp6client.la > >-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE >+dhcp6s_CFLAGS = -fPIE > dhcp6s_LDFLAGS = $(BINLDFLAGS) > dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \ > server6_token.l $(COMMONSRCS) > >-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE >+dhcp6r_CFLAGS = -fPIE > dhcp6r_LDFLAGS = $(BINLDFLAGS) > dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c > >-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS) >+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS) > dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS) > dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \ > client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS) > >-libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS) >+libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS) > libdhcp6client_la_LDFLAGS = -version-info \ > $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ > -release $(LT_RELEASE) \ >--- dhcpv6-1.0.22.orig/src/Makefile.in 2008-12-02 08:40:48.148706045 +0100 >+++ dhcpv6-1.0.22/src/Makefile.in 2008-12-02 08:47:47.308698921 +0100 >@@ -278,20 +278,20 @@ > > dhcp6clientinclude_HEADERS = client6_parse.h > lib_LTLIBRARIES = libdhcp6client.la >-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE >+dhcp6s_CFLAGS = -fPIE > dhcp6s_LDFLAGS = $(BINLDFLAGS) > dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \ > server6_token.l $(COMMONSRCS) > >-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE >+dhcp6r_CFLAGS = -fPIE > dhcp6r_LDFLAGS = $(BINLDFLAGS) > dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c >-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS) >+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS) > dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS) > dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \ > client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS) > >-libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS) >+libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS) > libdhcp6client_la_LDFLAGS = -version-info \ > $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ > -release $(LT_RELEASE) \ >--- dhcpv6-1.0.22.orig/src/relay6_socket.c 2008-12-02 08:40:48.158710880 +0100 >+++ dhcpv6-1.0.22/src/relay6_socket.c 2008-12-02 08:47:00.648708216 +0100 >@@ -42,6 +42,10 @@ > #include "relay6_parser.h" > #include "relay6_database.h" > >+#ifdef HAVE_LINUX_IPV6_H >+# include <linux/ipv6.h> >+#endif >+ > #ifndef IPV6_2292PKTINFO > #define IPV6_2292PKTINFO IPV6_PKTINFO > #endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 233326
:
161670
|
161672
|
162009
|
162011
|
174026
| 174048 |
174050
|
174051