Correctly detect sockaddr_in6 on NetBSD.

This commit is contained in:
markd 2012-07-07 11:52:29 +00:00
parent ce791b8c5b
commit 04bbf44c3e
3 changed files with 18 additions and 2 deletions

View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.43 2012/06/16 04:45:39 markd Exp $
# $NetBSD: Makefile,v 1.44 2012/07/07 11:52:29 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
PKGREVISION= 1
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.30 2012/07/05 18:48:33 joerg Exp $
$NetBSD: distinfo,v 1.31 2012/07/07 11:52:29 markd Exp $
SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49
RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec
@ -17,6 +17,7 @@ SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
SHA1 (patch-kdecore_CMakeLists.txt) = 1b517aa2d8c39988251c95bcd1daa012ea9bcfaa
SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8

View file

@ -0,0 +1,14 @@
$NetBSD: patch-kdecore_network_ConfigureChecks.cmake,v 1.1 2012/07/07 11:52:29 markd Exp $
Need netinet/in.h to successfully test for sockaddr_in6 on NetBSD
--- kdecore/network/ConfigureChecks.cmake.orig 2012-06-06 20:49:52.325046002 +0000
+++ kdecore/network/ConfigureChecks.cmake
@@ -57,6 +57,6 @@ check_prototype_exists(gai_strerror netd
# check for existing datatypes
set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h;netdb.h")
check_type_size("struct addrinfo" HAVE_STRUCT_ADDRINFO)
-set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h;netdb.h")
+set(CMAKE_EXTRA_INCLUDE_FILES "netinet/in.h;sys/socket.h;netdb.h")
check_type_size("struct sockaddr_in6" HAVE_STRUCT_SOCKADDR_IN6)
set(CMAKE_EXTRA_INCLUDE_FILES) #reset CMAKE_EXTRA_INCLUDE_FILES