haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

libmicrohttpd: fix linker errors.

Browse Source
This commit is contained in:
Kacper Kasper
2017-02-05 12:32:30 +01:00
parent 5d9678ab3c
commit 2a44252ade
2 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe
View File

@@ -28,25 +28,32 @@ simple WWW pages from within your C or C++ application, check it out."
HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
COPYRIGHT="2015 Free Software Foundation, Inc."
LICENSE="GNU LGPL v2.1"
REVISION="2"
REVISION="3"
SOURCE_URI="http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$portVersion.tar.gz"
CHECKSUM_SHA256="f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e"
PATCHES="libmicrohttpd-0.9.44.patchset"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
libmicrohttpd$secondaryArchSuffix = $portVersion
lib:libmicrohttpd$secondaryArchSuffix = $portVersion
lib:libmicrohttpd$secondaryArchSuffix = 10.34.0 compat >= 10
lib:libmicrospdy$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libgcrypt$secondaryArchSuffix
lib:libgnutls$secondaryArchSuffix
lib:libgpg_error$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
"
PROVIDES_devel="
libmicrohttpd${secondaryArchSuffix}_devel = $portVersion
devel:libmicrohttpd$secondaryArchSuffix = $portVersion
devel:libmicrohttpd$secondaryArchSuffix = 10.34.0 compat >= 0
devel:libmicrospdy$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES_devel="
haiku${secondaryArchSuffix}_devel
@@ -56,21 +63,27 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
# devel:libcurl$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libgcrypt$secondaryArchSuffix
devel:libgpg_error$secondaryArchSuffix
devel:libgnutls$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
"
BUILD_PREREQUIRES="
makefile_engine
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:autoreconf
cmd:aclocal
cmd:libtoolize$secondaryArchSuffix
cmd:automake
cmd:autoconf
"
BUILD()
{
autoreconf -fi
runConfigure ./configure
make $jobArgs
}
@@ -79,9 +92,11 @@ INSTALL()
{
make install
rm $libDir/libmicrohttpd.la $libDir/libmicrospdy.la
fixPkgconfig
prepareInstalledDevelLibs \
libmicrohttpd
libmicrohttpd libmicrospdy
packageEntries devel \
$developDir
}

29
net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.44.patchset
View File

@@ -1,4 +1,4 @@
From 2b2d15677b89e85fa3730287549974ad5c3b68b0 Mon Sep 17 00:00:00 2001
From 2af8c2cccc2f4f103ecbf55e920bbb9c74c1e8a7 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 19 Oct 2015 13:10:56 +0300
Subject: Fix gcc2 build
@@ -28,3 +28,30 @@ index 273a1e5..2e5a87d 100644
--
2.2.2
From d5d3b6e41568dca24b88cbbf783c6c3ed58a3439 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Mon, 30 Jan 2017 00:35:20 +0100
Subject: Fix linker errors.
diff --git a/configure.ac b/configure.ac
index 6609aaa..7c2431c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,12 @@ netbsd*)
mhd_host_os='OS/390'
AC_MSG_RESULT([[$mhd_host_os]])
;;
+haiku*)
+ AC_DEFINE_UNQUOTED(HAIKU,1,[This is a Haiku system])
+ mhd_host_os='Haiku'
+ AC_MSG_RESULT([[$mhd_host_os]])
+ AC_SEARCH_LIBS(gethostbyname, network)
+ ;;
*)
mhd_host_os='unrecognised OS'
AC_MSG_RESULT([[$mhd_host_os]])
--
2.2.2