mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
80 lines
2.1 KiB
Plaintext
80 lines
2.1 KiB
Plaintext
From a1c75ccbd1eabfa5c09b2e6afd6280ca71140547 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: Fix setsockopt test to search for libnetwork as well
|
|
|
|
Rewrite to use AC_SEARCH_LIBS.
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f369e6b..f48f333 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -309,9 +309,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
|
|
--
|
|
2.21.0
|
|
|
|
|
|
From 2f8a61037fc794af3f1ebc7d4b3fd0546b29e000 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 65d3b48..f0aa22e 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.21.0
|
|
|
|
|
|
From a2d818e5b6e7d16b875ab53d22b4581677678cf6 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Fri, 27 Sep 2019 20:41:20 +0200
|
|
Subject: fd_set needs sys/select.h
|
|
|
|
|
|
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
|
|
index bffe480..84ba050 100644
|
|
--- a/src/assuan-socket.c
|
|
+++ b/src/assuan-socket.c
|
|
@@ -34,6 +34,7 @@
|
|
#endif
|
|
#else
|
|
# include <sys/types.h>
|
|
+# include <sys/select.h>
|
|
# include <sys/socket.h>
|
|
# include <netinet/in.h>
|
|
# include <arpa/inet.h>
|
|
--
|
|
2.21.0
|
|
|