spack/var/spack/repos/builtin/packages/libssh2/pr-1114.patch
Harmen Stoppels eef14ddcad
openssl: prefer 3.x (#36729)
* openssl: prefer 3.x

This PR is not intended to be merged immediately, but it would be good
to see what packages fail to build in CI so that we can get proper
version constraints on openssl (before all packages update and support
both openssl 1 and 3)

* Disable assembly for 3.x %oneapi

* cmake: depend on spack curl, to deal with curl - openssl compat

* also make zlib external

* remove overly strict & unsafe requirement on py-cryptographty patch version number

* update openssl compat bounds in py-cryptography

* smaller diff

* Make libssh2 an autotools/cmake package

* fix weird upperbound in libssh2 as there is not openssl v2

* libssh2: pc file lists plain -lssl -lcrypto w/o leading -L flag, confusing libgit2 parsing of pkg-config output

* Actually fix the issue in libssh2: its pc file looks broken
2023-07-09 17:48:00 -04:00

22 lines
657 B
Diff

From 052b624e113912bb97bad877b81ddba22d37ba96 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Sun, 9 Jul 2023 21:36:07 +0200
Subject: [PATCH] Don't put `@LIBS@` in pc file
---
libssh2.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libssh2.pc.in b/libssh2.pc.in
index 4fdfaa924..9cbebb7f0 100644
--- a/libssh2.pc.in
+++ b/libssh2.pc.in
@@ -15,6 +15,6 @@ URL: https://www.libssh2.org/
Description: Library for SSH-based communication
Version: @LIBSSH2VER@
Requires.private: @LIBSREQUIRED@
-Libs: -L${libdir} -lssh2 @LIBS@
+Libs: -L${libdir} -lssh2
Libs.private: @LIBS@
Cflags: -I${includedir}