mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
uriparser, switch to cmake, bump version (#3572)
* uriparser, switch to cmake
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
From aa20b5949fb67ad82a216448db736ad8e138900b Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 6 Jan 2019 09:48:50 +0100
|
||||
Subject: Haiku check for -lsocket
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3144a69..ce90ee2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -26,6 +26,8 @@ AM_CONDITIONAL([WIN32], test "$WIN32" = "yes")
|
||||
AC_CHECK_FUNCS([wprintf])
|
||||
AC_CHECK_FUNCS([reallocarray]) # needs AC_USE_SYSTEM_EXTENSIONS (#define _GNU_SOURCE)
|
||||
|
||||
+## Haiku check for -lsocket -lnetwork inet_ntop
|
||||
+AC_SEARCH_LIBS([socket],[socket inet network])
|
||||
|
||||
## Option --disable-test
|
||||
AC_ARG_ENABLE(test, [
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -4,31 +4,28 @@ written in C."
|
||||
HOMEPAGE="https://uriparser.github.io/"
|
||||
COPYRIGHT="2007 Weijia Song
|
||||
2013 Radu Hociung
|
||||
2007-2018 Sebastian Pipping"
|
||||
2007-2019 Sebastian Pipping"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/uriparser/uriparser/releases/download/uriparser-$portVersion/uriparser-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="75248f3de3b7b13c8c9735ff7b86ebe72cbb8ad043291517d7d53488e0893abe"
|
||||
PATCHES="uriparser-$portVersion.patchset"
|
||||
CHECKSUM_SHA256="28af4adb05e811192ab5f04566bebc5ebf1c30d9ec19138f944963d52419e28f"
|
||||
SOURCE_FILENAME="uriparser-$portVersion.tar.gz"
|
||||
SOURCE_DIR="uriparser-$portVersion"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="1.0.24"
|
||||
libVersion="1.0.26"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
uriparser$secondaryArchSuffix = $portVersion
|
||||
cmd:uriparse$secondaryArchSuffix = $portVersion
|
||||
lib:liburiparser$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:uriparse = $portVersion
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libgtest$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
@@ -41,15 +38,17 @@ REQUIRES_devel="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libgtest$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:autoreconf
|
||||
cmd:cmake
|
||||
cmd:dot
|
||||
cmd:doxygen
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:qhelpgenerator$secondaryArchSuffix
|
||||
"
|
||||
|
||||
defineDebugInfoPackage uriparser$secondaryArchSuffix \
|
||||
@@ -57,21 +56,19 @@ defineDebugInfoPackage uriparser$secondaryArchSuffix \
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf
|
||||
runConfigure ./configure --disable-test --disable-doc
|
||||
mkdir -p build && cd build
|
||||
|
||||
cmake .. $cmakeDirArgs
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
|
||||
rm -f "$libDir"/liburiparser.la
|
||||
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf "$binDir"
|
||||
fi
|
||||
|
||||
prepareInstalledDevelLib liburiparser
|
||||
fixPkgconfig
|
||||
|
||||
@@ -81,5 +78,6 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
cd build
|
||||
make test
|
||||
}
|
||||
Reference in New Issue
Block a user