diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-11-29 15:38:45 +1030 |
|---|---|---|
| committer |   Eric Bénard <eric@eukrea.com> | 2010-11-29 11:31:58 +0100 |
| commit | 2ca2dffe47eb88ac014921f4e4d7479d953f9d57 (patch) | |
| tree | 164813b735df2a2c0d13800afb6d8be8cbdad604 /recipes/gnome | |
| parent | 7defefaf2dc4860901a83b0051b2daeed34cd1e3 (diff) | |
| download | openembedded-2ca2dffe47eb88ac014921f4e4d7479d953f9d57.tar.gz | |
orbit2_2.14.17.bb: Fix build when DISTRO_FEATURES lacks ipv6.
mipsel-oe-linux-uclibc-libtool: link: mipsel-oe-linux-uclibc-gcc -march=mips32 -isystem/mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Werror-implicit-function-declaration -Wl,-rpath-link -Wl,/mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib -Wl,-O1 -o .libs/test-linc test-linc.o -pthread -L/mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib ../src/.libs/liblinc.a /mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib/libgobject-2.0.so /mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib/libgthread-2.0.so -lpthread /mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib/libglib-2.0.so /mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib/libintl.so /mnt/oe/tmp/sysroots/mipsel-oe-linux-uclibc/lib/libiconv.so -lc -pthread
../src/.libs/liblinc.a(linc-protocols.o): In function `link_set_tmpdir':
linc-protocols.c:(.text+0x844): warning: the use of OBSOLESCENT `utime' is discouraged, use `utimes'
../src/.libs/liblinc.a(linc-protocols.o): In function `link_protocol_get_sockinfo_ipv4':
linc-protocols.c:(.text+0xeb8): warning: gethostbyaddr is obsolescent, use getaddrinfo() instead.
test-linc.o: In function `main':
test-linc.c:(.text+0x10e4): warning: gethostbyname is obsolescent, use getnameinfo() instead.
../src/.libs/liblinc.a(linc-protocols.o): In function `link_protocol_get_sockinfo_ipv6':
linc-protocols.c:(.text+0xd94): undefined reference to `in6addr_any'
collect2: ld returned 1 exit status
make[3]: *** [test-linc] Error 1
Signed-off-by: Graham Gower <graham.gower@gmail.com>
Signed-off-by: Eric Bénard <eric@eukrea.com>
Diffstat (limited to 'recipes/gnome')
| -rw-r--r-- | recipes/gnome/orbit2-2.14.17/disable-ipv6.patch | 12 | ||||
| -rw-r--r-- | recipes/gnome/orbit2_2.14.17.bb | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/recipes/gnome/orbit2-2.14.17/disable-ipv6.patch b/recipes/gnome/orbit2-2.14.17/disable-ipv6.patch new file mode 100644 index 0000000000..dfe0bc6dc2 --- /dev/null +++ b/recipes/gnome/orbit2-2.14.17/disable-ipv6.patch @@ -0,0 +1,12 @@ +--- ORBit2-2.14.17/linc2/src/linc-protocols.c.orig 2010-11-29 15:21:32.000000000 +1030 ++++ ORBit2-2.14.17/linc2/src/linc-protocols.c 2010-11-29 15:22:59.000000000 +1030 +@@ -937,6 +937,9 @@ + static const struct in6_addr in6addr_any = { { { 0 } } }; + # endif + #endif ++#ifdef DISABLE_IPV6 ++ const struct in6_addr in6addr_any = { { { 0 } } }; ++#endif + + static gboolean + link_protocol_get_sockinfo_ipv6 (const LinkProtocolInfo *proto, diff --git a/recipes/gnome/orbit2_2.14.17.bb b/recipes/gnome/orbit2_2.14.17.bb index 47f632793c..f89399722d 100644 --- a/recipes/gnome/orbit2_2.14.17.bb +++ b/recipes/gnome/orbit2_2.14.17.bb @@ -1,5 +1,8 @@ require orbit2.inc +SRC_URI += "file://disable-ipv6.patch" +noipv6 = "${@base_contains('DISTRO_FEATURES', 'ipv6', '', '-DDISABLE_IPV6', d)}" +EXTRA_OEMAKE_append = " 'CFLAGS=${CFLAGS} ${noipv6}'" SRC_URI[md5sum] = "10bfb957fa4a8935a0b4afaee7d71df7" SRC_URI[sha256sum] = "62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c" |