mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
61 lines
1.7 KiB
Plaintext
61 lines
1.7 KiB
Plaintext
From c8ac5a2281347d8df7a423885f68ed8039f26b93 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
|
Date: Sun, 16 Nov 2014 15:43:14 +0100
|
|
Subject: [PATCH] Fix setsockopt test to search for libnetwork as well
|
|
|
|
Rewrite to use AC_SEARCH_LIBS.
|
|
---
|
|
configure.ac | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 9b97ad4..5d00d35 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -284,9 +284,11 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
|
|
#
|
|
# Check for network libraries. They are needed for tests.
|
|
#
|
|
-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
|
|
- [NETLIBS="-lsocket $NETLIBS"]))
|
|
+_save_libs="$LIBS"
|
|
+AC_SEARCH_LIBS(setsockopt, network socket, [], [], [$NETLIBS])
|
|
+NETLIBS="$LIBS $NETLIBS"
|
|
AC_SUBST(NETLIBS)
|
|
+LIBS="$_save_libs"
|
|
|
|
if test "$have_w32_system" = yes; then
|
|
if test "$have_w32ce_system" = yes; then
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 5bab7edd125430bc91abe4e0570a9ed3e05b6314 Mon Sep 17 00:00:00 2001
|
|
From: fbrosson <fbrosson@localhost>
|
|
Date: Wed, 17 Jan 2018 22:03:45 +0000
|
|
Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
|
|
|
|
|
|
diff --git a/src/assuan.h.in b/src/assuan.h.in
|
|
index f9899d8..7136aac 100644
|
|
--- a/src/assuan.h.in
|
|
+++ b/src/assuan.h.in
|
|
@@ -64,9 +64,14 @@ extern "C"
|
|
|
|
/* Check for compiler features. */
|
|
#if __GNUC__
|
|
+#ifdef __GNUC_PATCHLEVEL__
|
|
#define _ASSUAN_GCC_VERSION (__GNUC__ * 10000 \
|
|
+ __GNUC_MINOR__ * 100 \
|
|
+ __GNUC_PATCHLEVEL__)
|
|
+#else
|
|
+#define _ASSUAN_GCC_VERSION (__GNUC__ * 10000 \
|
|
+ + __GNUC_MINOR__ * 100)
|
|
+#endif
|
|
|
|
#if _ASSUAN_GCC_VERSION > 30100
|
|
#define _ASSUAN_DEPRECATED __attribute__ ((__deprecated__))
|
|
--
|
|
2.15.1
|
|
|