Attachment 114001 Details for Bug 17289 – Fix broken cmake HAVE_SOCKLEN_T type finding check (update)

[patch] Fix broken cmake HAVE_SOCKLEN_T type finding check (update)

0001-Fix-broken-cmake-HAVE_SOCKLEN_T-type-finding-check.patch (text/plain), 1.74 KB, created by Ralf Habacker on 2015-03-04 18:09:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-04 18:09:18 UTC

Size: 1.74 KB

patch

obsolete

>From a1355acdd3dbac243d187a35959d95402bb1da75 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 4 Mar 2015 14:10:17 +0100
>Subject: [PATCH] Fix broken cmake HAVE_SOCKLEN_T type finding check.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=17289
>---
> cmake/ConfigureChecks.cmake | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
>index 06bd186..697db86 100644
>--- a/cmake/ConfigureChecks.cmake
>+++ b/cmake/ConfigureChecks.cmake
>@@ -32,7 +32,6 @@ check_symbol_exists(clearenv     "stdlib.h"         HAVE_CLEARENV)           #
> check_symbol_exists(writev       "sys/uio.h"        HAVE_WRITEV)             #  dbus-sysdeps.c, dbus-sysdeps-win.c
> check_symbol_exists(setrlimit    "sys/resource.h"   HAVE_SETRLIMIT)          #  dbus-sysdeps.c, dbus-sysdeps-win.c, test/test-segfault.c
> check_symbol_exists(socketpair   "sys/socket.h"     HAVE_SOCKETPAIR)         #  dbus-sysdeps.c
>-check_symbol_exists(socklen_t    "sys/socket.h"     HAVE_SOCKLEN_T)          #  dbus-sysdeps-unix.c
> check_symbol_exists(setlocale    "locale.h"         HAVE_SETLOCALE)          #  dbus-test-main.c
> check_symbol_exists(localeconv   "locale.h"         HAVE_LOCALECONV)         #  dbus-sysdeps.c
> check_symbol_exists(strtoll      "stdlib.h"         HAVE_STRTOLL)            #  dbus-send.c
>@@ -57,6 +56,9 @@ check_type_size("int"       SIZEOF_INT)
> check_type_size("long"      SIZEOF_LONG)
> check_type_size("long long" SIZEOF_LONG_LONG)
> check_type_size("__int64"   SIZEOF___INT64)
>+set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h")
>+check_type_size("socklen_t" SOCKLEN_T)          #  dbus-sysdeps-unix.c
>+set(CMAKE_EXTRA_INCLUDE_FILES)
> 
> # DBUS_INT64_TYPE
> if(SIZEOF_INT EQUAL 8)
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 17289: 18494 | 18495 | 113960 | 113966 | 113983 | 113984 | 113988 | 113989 | 113990 | 113991 | 113992 | 113993 | 113994 | 113996 | 114001 | 114002

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.