mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
libssh: bump version
2 failed tests
This commit is contained in:
@@ -18,15 +18,15 @@ COPYRIGHT="1995 Tatu Ylonen
|
||||
2019 Simo Sorce"
|
||||
LICENSE="GNU LGPL v2.1
|
||||
BSD (2-clause)"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.libssh.org/files/${portVersion%.*}/libssh-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b"
|
||||
CHECKSUM_SHA256="b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234"
|
||||
PATCHES="libssh-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="4.8.7"
|
||||
libVersion="4.9.5"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -102,22 +102,20 @@ BUILD()
|
||||
_maybe_pie=("-DCMAKE_EXE_LINKER_FLAGS=-pie -fstack-protector")
|
||||
fi
|
||||
|
||||
mkdir -p build; cd build
|
||||
cmake .. $cmakeDirArgs \
|
||||
cmake -B build -S . $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
|
||||
-DUNIT_TESTING=ON \
|
||||
"${_maybe_pie[@]}"
|
||||
make $jobArgs
|
||||
make -C build $jobArgs
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
make docs
|
||||
make -C build docs
|
||||
fi
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd build
|
||||
make install
|
||||
make -C build install
|
||||
|
||||
prepareInstalledDevelLibs libssh
|
||||
fixPkgconfig
|
||||
@@ -135,13 +133,12 @@ INSTALL()
|
||||
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
install -d -m 755 "$developDocDir"
|
||||
cp -rT doc/html "$developDocDir"
|
||||
cp -rT build/doc/html "$developDocDir"
|
||||
packageEntries doc "$developDir"
|
||||
fi
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd build
|
||||
make test
|
||||
make -C build test
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
From ca6ac7339b177876bb1743f9ad742cc2ec969556 Mon Sep 17 00:00:00 2001
|
||||
From 9e381e6b4af287418707e296a556a6acd44cf720 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Sat, 22 Sep 2018 16:20:25 +0200
|
||||
Subject: Haiku networking functions lives in lnetwork
|
||||
|
||||
|
||||
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
|
||||
index 5d43b36..00ea1b0 100644
|
||||
index 9de1022..1e0b363 100644
|
||||
--- a/ConfigureChecks.cmake
|
||||
+++ b/ConfigureChecks.cmake
|
||||
@@ -244,6 +244,11 @@ if (UNIX)
|
||||
@@ -239,6 +239,11 @@ if (UNIX)
|
||||
set(HAVE_GETADDRINFO TRUE)
|
||||
set(_REQUIRED_LIBRARIES ${_REQUIRED_LIBRARIES} socket)
|
||||
endif (HAVE_LIBSOCKET)
|
||||
@@ -21,12 +21,12 @@ index 5d43b36..00ea1b0 100644
|
||||
# libnsl/inet_pton (Solaris)
|
||||
check_library_exists(nsl inet_pton "" HAVE_LIBNSL)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index a576cf7..7f0fbd9 100644
|
||||
index d6245c0..e596c93 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -16,6 +16,13 @@ if (WIN32)
|
||||
)
|
||||
endif (WIN32)
|
||||
@@ -9,6 +9,13 @@ set(LIBSSH_LINK_LIBRARIES
|
||||
${LIBSSH_REQUIRED_LIBRARIES}
|
||||
)
|
||||
|
||||
+if (HAVE_LIBNETWORK)
|
||||
+ set(LIBSSH_LINK_LIBRARIES
|
||||
@@ -39,5 +39,5 @@ index a576cf7..7f0fbd9 100644
|
||||
set(LIBSSH_PRIVATE_INCLUDE_DIRS
|
||||
${LIBSSH_PRIVATE_INCLUDE_DIRS}
|
||||
--
|
||||
2.30.2
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user