From ca40ed36d65ca74e72075c11f997c197953e5b77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 19 Nov 2014 17:18:03 +0100 Subject: [PATCH] Add recipe and patch for libassuan --- dev-libs/libassuan/libassuan-2.1.2.recipe | 65 +++++++++++++++++++ .../patches/libassuan-2.1.2.patchset | 31 +++++++++ 2 files changed, 96 insertions(+) create mode 100644 dev-libs/libassuan/libassuan-2.1.2.recipe create mode 100644 dev-libs/libassuan/patches/libassuan-2.1.2.patchset diff --git a/dev-libs/libassuan/libassuan-2.1.2.recipe b/dev-libs/libassuan/libassuan-2.1.2.recipe new file mode 100644 index 000000000..91b9a9291 --- /dev/null +++ b/dev-libs/libassuan/libassuan-2.1.2.recipe @@ -0,0 +1,65 @@ +SUMMARY="IPC library used by GnuPG and GPGME" +DESCRIPTION=" +IPC library used by GnuPG and GPGME. +" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2003-2013 g10 Code GmbH" +HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html" +SRC_URI="ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-$portVersion.tar.bz2" +CHECKSUM_SHA256="39f8a7c9349aaaf7ccd937b90660153ec4d2d4df2465018754e5bcae5b1db77b" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libassuan$secondaryArchSuffix = $portVersion compat >= 1 + lib:libassuan$secondaryArchSuffix = 0.4.2 compat >= 0 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libgpg_error${secondaryArchSuffix} + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libgpg_error${secondaryArchSuffix} + " + +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:awk + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:git + cmd:ld$secondaryArchSuffix + " + +PATCHES="libassuan-$portVersion.patchset" + +BUILD() +{ + autoconf + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libassuan + + packageEntries devel \ + $developDir $binDir/libassuan-config +} + +PROVIDES_devel=" + libassuan${secondaryArchSuffix}_devel = $portVersion compat >= 1 + cmd:libassuan_config$secondaryArchSuffix = $portVersion compat >= 1 + devel:libassuan$secondaryArchSuffix = 0.4.2 compat >= 0 + " + +REQUIRES_devel=" + libassuan$secondaryArchSuffix == $portVersion + " diff --git a/dev-libs/libassuan/patches/libassuan-2.1.2.patchset b/dev-libs/libassuan/patches/libassuan-2.1.2.patchset new file mode 100644 index 000000000..598f48390 --- /dev/null +++ b/dev-libs/libassuan/patches/libassuan-2.1.2.patchset @@ -0,0 +1,31 @@ +From c8ac5a2281347d8df7a423885f68ed8039f26b93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +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 cb21af1..ca82038 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -263,9 +263,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 +