mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
c-ares: bump version.
provide curl_cv_func_recvfrom_args and curl_cv_func_send_args to skip the long checks.
This commit is contained in:
Jerome Duval
@@ -1,85 +0,0 @@
|
||||
SUMMARY="A C library for asynchronous DNS requests"
|
||||
DESCRIPTION="This is c-ares, an asynchronous resolver library. It is intended \
|
||||
for applications which need to perform DNS queries without blocking, or need \
|
||||
to perform multiple DNS queries in parallel. The primary examples of such \
|
||||
applications are servers which communicate with multiple clients and programs \
|
||||
with graphical user interfaces."
|
||||
HOMEPAGE="https://c-ares.haxx.se/"
|
||||
COPYRIGHT=" 2004-2013 by Daniel Stenberg et al
|
||||
1998-2013 by the Massachusetts Institute of Technology
|
||||
1987-2001 The Regents of the University of California
|
||||
1996-2004 by Internet Software Consortium
|
||||
2009 by Jakub Hrozek
|
||||
2010 Jeremy Lal
|
||||
2012 Marko Kreen
|
||||
2005 Dominick Meglio"
|
||||
LICENSE="MIT"
|
||||
REVISION="3"
|
||||
SOURCE_URI="http://c-ares.haxx.se/download/c-ares-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd"
|
||||
SOURCE_DIR="c-ares-$portVersion"
|
||||
PATCHES="c_ares-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86 !x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
|
||||
|
||||
PROVIDES="
|
||||
c_ares$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libcares$secondaryArchSuffix = 2.1 compat >= 2
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:ahost$secondaryArchSuffix = $portVersion compat >= 1
|
||||
cmd:adig$secondaryArchSuffix = $portVersion compat >= 1
|
||||
cmd:acountry$secondaryArchSuffix = $portVersion compat >= 1
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
c_ares${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
devel:libcares$secondaryArchSuffix = 2.1 compat >= 2
|
||||
"
|
||||
REQUIRES_devel="
|
||||
c_ares$secondaryArchSuffix == $portVersion
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# remove libtool file
|
||||
rm $libDir/libcares.la
|
||||
|
||||
prepareInstalledDevelLibs libcares
|
||||
fixPkgconfig
|
||||
packageEntries devel $developDir \
|
||||
$manDir/man3
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
mkdir -p $binDir
|
||||
cp -af .libs/ahost .libs/adig .libs/acountry $binDir
|
||||
mkdir -p $manDir/man1
|
||||
cp -af ahost.1 adig.1 acountry.1 $manDir/man1
|
||||
fi
|
||||
}
|
||||
@@ -1,85 +0,0 @@
|
||||
SUMMARY="A C library for asynchronous DNS requests"
|
||||
DESCRIPTION="This is c-ares, an asynchronous resolver library. It is intended \
|
||||
for applications which need to perform DNS queries without blocking, or need \
|
||||
to perform multiple DNS queries in parallel. The primary examples of such \
|
||||
applications are servers which communicate with multiple clients and programs \
|
||||
with graphical user interfaces."
|
||||
HOMEPAGE="https://c-ares.haxx.se/"
|
||||
COPYRIGHT=" 2004-2013 by Daniel Stenberg et al
|
||||
1998-2013 by the Massachusetts Institute of Technology
|
||||
1987-2001 The Regents of the University of California
|
||||
1996-2004 by Internet Software Consortium
|
||||
2009 by Jakub Hrozek
|
||||
2010 Jeremy Lal
|
||||
2012 Marko Kreen
|
||||
2005 Dominick Meglio"
|
||||
LICENSE="MIT"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://c-ares.haxx.se/download/c-ares-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7"
|
||||
SOURCE_DIR="c-ares-$portVersion"
|
||||
PATCHES="c_ares-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="?x86 !x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86 !x86_gcc2"
|
||||
|
||||
PROVIDES="
|
||||
c_ares$secondaryArchSuffix = $portVersion compat >= 1
|
||||
lib:libcares$secondaryArchSuffix = 2.2.0 compat >= 2
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:ahost$secondaryArchSuffix = $portVersion compat >= 1
|
||||
cmd:adig$secondaryArchSuffix = $portVersion compat >= 1
|
||||
cmd:acountry$secondaryArchSuffix = $portVersion compat >= 1
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
c_ares${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
devel:libcares$secondaryArchSuffix = 2.2.0 compat >= 2
|
||||
"
|
||||
REQUIRES_devel="
|
||||
c_ares$secondaryArchSuffix == $portVersion
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# remove libtool file
|
||||
rm $libDir/libcares.la
|
||||
|
||||
prepareInstalledDevelLibs libcares
|
||||
fixPkgconfig
|
||||
packageEntries devel $developDir \
|
||||
$manDir/man3
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
mkdir -p $binDir
|
||||
cp -af .libs/ahost .libs/adig .libs/acountry $binDir
|
||||
mkdir -p $manDir/man1
|
||||
cp -af ahost.1 adig.1 acountry.1 $manDir/man1
|
||||
fi
|
||||
}
|
||||
@@ -16,14 +16,14 @@ COPYRIGHT="2004-2018 by Daniel Stenberg et al
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://c-ares.haxx.se/download/c-ares-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e"
|
||||
CHECKSUM_SHA256="6cdb97871f2930530c97deb7cf5c8fa4be5a0b02c7cea6e7c7667672a39d6852"
|
||||
SOURCE_DIR="c-ares-$portVersion"
|
||||
PATCHES="c_ares-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
|
||||
|
||||
libVersion="2.2.0"
|
||||
libVersion="2.3.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -49,9 +49,11 @@ BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
@@ -60,8 +62,10 @@ defineDebugInfoPackage c_ares$secondaryArchSuffix \
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
autoreconf -fi
|
||||
curl_cv_func_recvfrom_args="int,void *,size_t,int,struct sockaddr *,socklen_t *,ssize_t" \
|
||||
curl_cv_func_send_args="int,const void *,size_t,int,ssize_t" \
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
From 0c1419ef8f9f44505eb183e8548d90542ddc7de1 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Wed, 30 Oct 2013 15:41:17 -0600
|
||||
Subject: applying patch c_ares-1.10.0.patch
|
||||
|
||||
|
||||
diff --git a/ares.h b/ares.h
|
||||
index 9b3f376..b871032 100644
|
||||
--- a/ares.h
|
||||
+++ b/ares.h
|
||||
@@ -38,7 +38,7 @@
|
||||
require it! */
|
||||
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
|
||||
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
|
||||
- defined(ANDROID) || defined(__ANDROID__)
|
||||
+ defined(ANDROID) || defined(__ANDROID__) || defined(__HAIKU__)
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
|
||||
diff --git a/ares_private.h b/ares_private.h
|
||||
index ab5be5a..b884fda 100644
|
||||
--- a/ares_private.h
|
||||
+++ b/ares_private.h
|
||||
@@ -65,6 +65,11 @@
|
||||
|
||||
#define PATH_HOSTS "InetDBase:Hosts"
|
||||
|
||||
+#elif defined(__HAIKU__)
|
||||
+
|
||||
+#define PATH_RESOLV_CONF "/boot/system/settings/network/resolv.conf"
|
||||
+#define PATH_HOSTS "/boot/system/settings/network/hosts"
|
||||
+
|
||||
#else
|
||||
|
||||
#define PATH_RESOLV_CONF "/etc/resolv.conf"
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From 3287466624c281088ae83001e96e9391d0f5b97d Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Wed, 30 Oct 2013 15:52:39 -0600
|
||||
Subject: Search for libnetwork
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5c02450..423ce64 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -222,6 +222,15 @@ then
|
||||
])
|
||||
fi
|
||||
|
||||
+if test "$HAVE_GETHOSTBYNAME" != "1"
|
||||
+then
|
||||
+ dnl gethostbyname in the network lib?
|
||||
+ AC_CHECK_LIB(network, gethostbyname,
|
||||
+ [HAVE_GETHOSTBYNAME="1"
|
||||
+ LIBS="$LIBS -lnetwork"
|
||||
+ ])
|
||||
+fi
|
||||
+
|
||||
dnl At least one system has been identified to require BOTH nsl and socket
|
||||
dnl libs at the same time to link properly.
|
||||
if test "$HAVE_GETHOSTBYNAME" != "1"
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
From f216b7020930b1c1d5d9bbc8be326a304c0354fb Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Wed, 30 Oct 2013 15:41:17 -0600
|
||||
Subject: applying patch c_ares-1.10.0.patch
|
||||
|
||||
|
||||
diff --git a/ares.h b/ares.h
|
||||
index cfd72b0..0635672 100644
|
||||
--- a/ares.h
|
||||
+++ b/ares.h
|
||||
@@ -39,7 +39,7 @@
|
||||
#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
|
||||
defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
|
||||
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
|
||||
- defined(__QNXNTO__)
|
||||
+ defined(__QNXNTO__) || defined(__HAIKU__)
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
#if (defined(NETWARE) && !defined(__NOVELL_LIBC__))
|
||||
--
|
||||
2.12.2
|
||||
|
||||
|
||||
From 6aa3f0a11037e40832a7e1920bf24012e1e552ca Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Wed, 30 Oct 2013 15:52:39 -0600
|
||||
Subject: Search for libnetwork
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 92bffaa..93ff9fa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -231,6 +231,15 @@ then
|
||||
])
|
||||
fi
|
||||
|
||||
+if test "$HAVE_GETHOSTBYNAME" != "1"
|
||||
+then
|
||||
+ dnl gethostbyname in the network lib?
|
||||
+ AC_CHECK_LIB(network, gethostbyname,
|
||||
+ [HAVE_GETHOSTBYNAME="1"
|
||||
+ LIBS="$LIBS -lnetwork"
|
||||
+ ])
|
||||
+fi
|
||||
+
|
||||
dnl At least one system has been identified to require BOTH nsl and socket
|
||||
dnl libs at the same time to link properly.
|
||||
if test "$HAVE_GETHOSTBYNAME" != "1"
|
||||
--
|
||||
2.12.2
|
||||
|
||||
Reference in New Issue
Block a user