Hi,
The following diff adds few magic to devel/cargo module in order to use system
libraries instead of building embedded version in crates in an automatic way.
It works by removing source library from a defined set of crates. So it will be
not possible to build the embedded library (the build will fail instead of
silenciously build embedded version).
It also provides magic to help configuring crates to use system library.
Please note it is still the responsability of the maintainer to add LIB_DEPENDS
and WANTLIB in the port.
The diff takes care of commun crates currently in use in ports:
- bzip2-sys
- curl-sys
- gettext-sys
- libgit2-sys
- libsqlite3-sys
- libssh2-sys
- libz-sys
- lua52-sys
- openssl-sys (automatically patch the crate to support LibreSSL -current)
- pcre2-sys
- onig_sys
- sass-sys
I reviewed all ports using devel/cargo module, and I adapted them to:
- remove local configuration knob (provided automatically by devel/cargo)
- remove openssl-sys patches (provided automatically by devel/cargo)
- add LIB_DEPENDS and WANTLIB when an embedded version was used previously (+ REVISION bump)
- while here, do some cleanup about libc crate version (sparc64 support)
(Maintainers Cc)
With it, it should be more simple to add new rust port, as the infrastructure
will deal/configure magically several crates for using system libraries if
possible.
Comments or OK ?
--
Sebastien Marie
diff 1a56be4810731bba436362c29d50102c1f9f7b22 /data/semarie/repos/openbsd/ports
blob - 6b1efa073cdaf3b0feb049a9dd9b0be279db95be
file + /dev/null
--- audio/ncspot/patches/patch-modcargo-crates_openssl-sys-0_9_54_build_main_rs
+++ audio/ncspot/patches/patch-modcargo-crates_openssl-sys-0_9_54_build_main_rs
@@ -1,13 +0,0 @@
-$OpenBSD: patch-modcargo-crates_openssl-sys-0_9_54_build_main_rs,v 1.1 2020/02/08 22:29:45 bket Exp $
-
-Index: modcargo-crates/openssl-sys-0.9.54/build/main.rs
---- modcargo-crates/openssl-sys-0.9.54/build/main.rs.orig
-+++ modcargo-crates/openssl-sys-0.9.54/build/main.rs
-@@ -204,6 +204,7 @@ See rust-openssl README for more information:
- (3, 0, 0) => ('3', '0', '0'),
- (3, 0, 1) => ('3', '0', '1'),
- (3, 0, _) => ('3', '0', 'x'),
-+ (3, _, _) => ('3', 'x', 'x'),
- _ => version_error(),
- };
-
blob - 382537c360d61e62c3a9890cea52968869a44e4e
file + devel/cargo/cargo.port.mk
--- devel/cargo/cargo.port.mk
+++ devel/cargo/cargo.port.mk
@@ -61,6 +61,102 @@ MODCARGO_post-extract += \
mv ${WRKDIR}/${_cratename}-${_cratever} ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever} ;
.endfor
+# post-extract target to provide clean environment for specific crates
+# in order to avoid rebuilding libraries from source behind us.
+MODCARGO_CRATES_BUILDDEP ?= Yes
+.if ${MODCARGO_CRATES_BUILDDEP:L} == "yes"
+. for _cratename _cratever in ${MODCARGO_CRATES}
+
+. if "${_cratename}" == "pkg-config"
+# configure to build no static by default
+MODCARGO_ENV += PKG_CONFIG_ALL_DYNAMIC=1
+
+. elif "${_cratename}" == "bzip2-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/bzip2-* ; \
+ echo 'fn main() { println!("cargo:rustc-link-lib=bz2\ncargo:rustc-link-search=${LOCALBASE}/lib"); }' \
+ > ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/build.rs ;
+
+. elif "${_cratename}" == "curl-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/curl ;
+
+. elif "${_cratename}" == "gettext-sys"
+MODCARGO_ENV += GETTEXT_DIR=${LOCALBASE}
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -f -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/gettext-*.tar.xz ;
+
+. elif "${_cratename}" == "libdbus-sys"
+# no libsrc, fail if lib not found
+
+. elif "${_cratename}" == "libgit2-sys"
+MODCARGO_ENV += LIBGIT2_SYS_USE_PKG_CONFIG=1
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/libgit2 ;
+
+. elif "${_cratename}" == "libsqlite3-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/sqlite3 ;
+
+. elif "${_cratename}" == "libssh2-sys"
+MODCARGO_ENV += LIBSSH2_SYS_USE_PKG_CONFIG=1
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/libssh2 ;
+
+. elif "${_cratename}" == "libz-sys"
+MODCARGO_ENV += LIBZ_SYS_STATIC=0
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/src/zlib ;
+
+. elif "${_cratename}" == "lua52-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/lua ; \
+ ${ECHO_MSG} "[modcargo] Patching ${_cratename}-${_cratever} to find lang/lua/5.2" ; \
+ sed -i -e 's,find_library("lua5.2"),find_library("lua52"),' \
+ ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/build.rs ;
+
+. elif "${_cratename}" == "openssl-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Patching ${_cratename}-${_cratever} for supporting -current" ; \
+ sed -i -e "/ => ('.', '.'),/h" \
+ -e "/ => ('.', '.', '.'),/h" \
+ -e "/_ => version_error(),/{g; s/(.*) =>/_ =>/; }" \
+ ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/build/main.rs ;
+
+. elif "${_cratename}" == "pcre2-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/pcre2 ;
+
+. elif "${_cratename}" == "portaudio-sys"
+# no libsrc, fail if lib not found
+
+. elif "${_cratename}" == "pq-sys"
+# no libsrc, fail if lib not found
+
+. elif "${_cratename}" == "onig_sys"
+MODCARGO_ENV += RUSTONIG_SYSTEM_LIBONIG=1
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/oniguruma ;
+
+. elif "${_cratename}" == "sass-sys"
+MODCARGO_post-extract += \
+ ${ECHO_MSG} "[modcargo] Removing libsrc for ${_cratename}-${_cratever}" ; \
+ rm -rf -- ${MODCARGO_VENDOR_DIR}/${_cratename}-${_cratever}/libsass ;
+
+. endif
+. endfor
+.endif
+
# post-patch target for generating metadata of crates.
.for _cratename _cratever in ${MODCARGO_CRATES}
MODCARGO_post-patch += \
blob - baa12dd4f0f06d8d18e8bb803a6899982c96ccd2
file + devel/cbindgen/Makefile
--- devel/cbindgen/Makefile
+++ devel/cbindgen/Makefile
@@ -20,8 +20,6 @@ MODULES = devel/cargo
CONFIGURE_STYLE = cargo
-MODCARGO_CRATES_UPDATE += libc
-
MODCARGO_CRATES += ansi_term 0.11.0 # MIT
MODCARGO_CRATES += atty 0.2.13 # MIT
MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0
blob - 2042b1f9d448cf5271dd77baad4114f0a52aed55
file + security/sn0int/Makefile
--- security/sn0int/Makefile
+++ security/sn0int/Makefile
@@ -8,6 +8,7 @@ COMMENT = semi-automatic OSINT framework and package m
GH_ACCOUNT = kpcyrd
GH_PROJECT = sn0int
GH_TAGNAME = v0.11.2
+REVISION = 0
CATEGORIES = security
@@ -15,8 +16,9 @@ CATEGORIES = security
PERMIT_PACKAGE = Yes
# uses pledge()
-LIB_DEPENDS = databases/sqlite3
-WANTLIB += c c++abi m pthread sqlite3
+LIB_DEPENDS = databases/sqlite3 \
+ lang/lua/5.2
+WANTLIB += c c++abi m pthread sqlite3 lua5.2
# as devel/cargo MODULES adds DISTFILES, GH_* didn't
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
@@ -27,7 +29,9 @@ BUILD_DEPENDS = lang/rust>=1.34 \
RUN_DEPENDS = net/libmaxminddb,-asn \
net/libmaxminddb,-city
+# keep libc >=0.2.63 for sparc64 support
MODCARGO_CRATES_UPDATE += libc
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += adler32 1.0.3 # BSD-3-Clause AND Zlib
MODCARGO_CRATES += aho-corasick 0.7.3 # Unlicense/MIT
@@ -168,7 +172,7 @@ MODCARGO_CRATES += kuchiki 0.7.3 # MIT
MODCARGO_CRATES += language-tags 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.3.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
+#MODCARGO_CRATES += libc 0.2.54 # MIT OR Apache-2.0
MODCARGO_CRATES += libflate 0.1.22 # MIT
MODCARGO_CRATES += libsqlite3-sys 0.12.0 # MIT
MODCARGO_CRATES += libz-sys 1.0.25 # MIT/Apache-2.0
blob - b49bd12e52978619325c0190c01588bf0a4c51d8
file + sysutils/exa/Makefile
--- sysutils/exa/Makefile
+++ sysutils/exa/Makefile
@@ -17,7 +17,9 @@ DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
MODULES = devel/cargo
+# keep libc >=0.2.63 for sparc64 support
MODCARGO_CRATES_UPDATE += libc
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += aho-corasick 0.7.3 # Unlicense/MIT
MODCARGO_CRATES += ansi_term 0.12.0 # MIT
@@ -36,7 +38,7 @@ MODCARGO_CRATES += idna 0.1.5 # MIT/Apache-2.0
MODCARGO_CRATES += iso8601 0.1.1 # MIT
MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
+#MODCARGO_CRATES += libc 0.2.51 # MIT OR Apache-2.0
MODCARGO_CRATES += libgit2-sys 0.8.1 # MIT/Apache-2.0
MODCARGO_CRATES += libz-sys 1.0.25 # MIT/Apache-2.0
MODCARGO_CRATES += locale 0.2.2 # MIT
@@ -83,12 +85,8 @@ MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu 0.4.0
MODCARGO_CRATES += wincolor 1.0.1 # Unlicense/MIT
MODCARGO_CRATES += zoneinfo_compiled 0.4.8 # MIT
-MODCARGO_CRATES_UPDATE += libc
-
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
-
-MAKE_ENV += LIBGIT2_SYS_USE_PKG_CONFIG=1
LIB_DEPENDS += devel/libgit2/libgit2
WANTLIB += c c++abi pthread git2
blob - d6875841c426e0e387ec6976ce57ae8fcc47bc71
file + textproc/mdbook/Makefile
--- textproc/mdbook/Makefile
+++ textproc/mdbook/Makefile
@@ -20,8 +20,6 @@ DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
MODULES = devel/cargo
-MODCARGO_CRATES_UPDATE += libc
-
MODCARGO_CRATES += aho-corasick 0.7.6 # Unlicense/MIT
MODCARGO_CRATES += ammonia 3.0.0 # MIT OR Apache-2.0
MODCARGO_CRATES += ansi_term 0.11.0 # MIT
blob - 520a01d0e9db57886aad2659c6c66205e9989b14
file + textproc/ripgrep/Makefile
--- textproc/ripgrep/Makefile
+++ textproc/ripgrep/Makefile
@@ -19,7 +19,9 @@ DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
MODULES = devel/cargo
BUILD_DEPENDS = textproc/asciidoc
+# keep libc >=0.2.63 for sparc64 support
MODCARGO_CRATES_UPDATE += libc
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
MODCARGO_CRATES += aho-corasick 0.7.4 # Unlicense/MIT
MODCARGO_CRATES += atty 0.2.13 # MIT
@@ -44,7 +46,7 @@ MODCARGO_CRATES += itoa 0.4.4 # MIT/Apache-2.0
MODCARGO_CRATES += jemalloc-sys 0.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += jemallocator 0.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += lazy_static 1.3.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
+#MODCARGO_CRATES += libc 0.2.60 # MIT OR Apache-2.0
MODCARGO_CRATES += log 0.4.8 # MIT OR Apache-2.0
MODCARGO_CRATES += memchr 2.2.1 # Unlicense/MIT
MODCARGO_CRATES += memmap 0.7.0 # MIT/Apache-2.0
blob - a0f27c89541d433ccb8ed373f39e22700643643c
file + www/geckodriver/Makefile
--- www/geckodriver/Makefile
+++ www/geckodriver/Makefile
@@ -5,6 +5,7 @@ COMMENT = W3C webdriver for Gecko-based browsers
GH_ACCOUNT = mozilla
GH_PROJECT = geckodriver
GH_TAGNAME = v0.22.0
+REVISION = 0
CATEGORIES = www
@@ -20,7 +21,9 @@ MODULES = devel/cargo
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
+# keep libc >=0.2.63 for sparc64 support
MODCARGO_CRATES_UPDATE += libc
+MODCARGO_CRATES += libc 0.2.63 # MIT/Apache-2.0
MODCARGO_CRATES += adler32 1.0.3 # BSD-3-Clause AND Zlib
MODCARGO_CRATES += aho-corasick 0.6.8 # Unlicense/MIT
@@ -59,7 +62,7 @@ MODCARGO_CRATES += itoa 0.4.3 # MIT/Apache-2.0
MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.1.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.1.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.63 # MIT/Apache-2.0
+#MODCARGO_CRATES += libc 0.2.43 # MIT/Apache-2.0
MODCARGO_CRATES += lock_api 0.1.3 # Apache-2.0/MIT
MODCARGO_CRATES += log 0.4.5 # MIT/Apache-2.0
MODCARGO_CRATES += mio 0.6.16 # MIT
@@ -156,6 +159,7 @@ MODCARGO_CRATES += winreg 0.5.1 # MIT
MODCARGO_CRATES += ws2_32-sys 0.2.1 # MIT
MODCARGO_CRATES += zip 0.3.3 # MIT
-WANTLIB += c c++abi m pthread
+LIB_DEPENDS += archivers/bzip2
+WANTLIB += c c++abi m pthread bz2
.include <bsd.port.mk>
blob - 734c300a37c4c1b9f43643fb3089e1e56d5e0621
file + /dev/null
--- www/newsboat/patches/patch-modcargo-crates_gettext-sys-0_19_8_build_rs
+++ www/newsboat/patches/patch-modcargo-crates_gettext-sys-0_19_8_build_rs
@@ -1,15 +0,0 @@
-$OpenBSD: patch-modcargo-crates_gettext-sys-0_19_8_build_rs,v 1.1 2019/11/10 17:00:15 fcambus Exp $
-
-Use system gettext, and not the vendored version from the crate.
-
-Index: modcargo-crates/gettext-sys-0.19.8/build.rs
---- modcargo-crates/gettext-sys-0.19.8/build.rs.orig
-+++ modcargo-crates/gettext-sys-0.19.8/build.rs
-@@ -79,6 +79,7 @@ fn main() {
- return;
- }
- // else can't use system gettext on this target
-+ return;
- }
-
- if target.contains("apple-darwin") {
blob - 54af589a70b959c44446b44703b1af053497632f
file + /dev/null
--- www/newsboat/patches/patch-modcargo-crates_openssl-sys-0_9_46_build_main_rs
+++ www/newsboat/patches/patch-modcargo-crates_openssl-sys-0_9_46_build_main_rs
@@ -1,55 +0,0 @@
-$OpenBSD: patch-modcargo-crates_openssl-sys-0_9_46_build_main_rs,v 1.1 2019/11/10 17:00:15 fcambus Exp $
-
-Support LibreSSL 3.0.x.
-
-Index: modcargo-crates/openssl-sys-0.9.46/build/main.rs
---- modcargo-crates/openssl-sys-0.9.46/build/main.rs.orig
-+++ modcargo-crates/openssl-sys-0.9.46/build/main.rs
-@@ -183,28 +183,30 @@ See rust-openssl README for more information:
- if let Some(libressl_version) = libressl_version {
- println!("cargo:libressl_version_number={:x}", libressl_version);
-
-+ let major = (libressl_version >> 28) as u8;
- let minor = (libressl_version >> 20) as u8;
- let fix = (libressl_version >> 12) as u8;
-- let (minor, fix) = match (minor, fix) {
-- (5, 0) => ('5', '0'),
-- (5, 1) => ('5', '1'),
-- (5, 2) => ('5', '2'),
-- (5, _) => ('5', 'x'),
-- (6, 0) => ('6', '0'),
-- (6, 1) => ('6', '1'),
-- (6, 2) => ('6', '2'),
-- (6, _) => ('6', 'x'),
-- (7, _) => ('7', 'x'),
-- (8, 0) => ('8', '0'),
-- (8, 1) => ('8', '1'),
-- (8, _) => ('8', 'x'),
-- (9, 0) => ('9', '0'),
-- (9, _) => ('9', 'x'),
-- _ => version_error(),
-+ let (major, minor, fix) = match (major, minor, fix) {
-+ (2, 5, 0) => ('2', '5', '0'),
-+ (2, 5, 1) => ('2', '5', '1'),
-+ (2, 5, 2) => ('2', '5', '2'),
-+ (2, 5, _) => ('2', '5', 'x'),
-+ (2, 6, 0) => ('2', '6', '0'),
-+ (2, 6, 1) => ('2', '6', '1'),
-+ (2, 6, 2) => ('2', '6', '2'),
-+ (2, 6, _) => ('2', '6', 'x'),
-+ (2, 7, _) => ('2', '7', 'x'),
-+ (2, 8, 0) => ('2', '8', '0'),
-+ (2, 8, 1) => ('2', '8', '1'),
-+ (2, 8, _) => ('2', '8', 'x'),
-+ (2, 9, 0) => ('2', '9', '0'),
-+ (2, 9, _) => ('2', '9', 'x'),
-+ (3, 0, 0) => ('3', '0', '0'),
-+ _ => ('3', '0', '0'),
- };
-
- println!("cargo:libressl=true");
-- println!("cargo:libressl_version=2{}{}", minor, fix);
-+ println!("cargo:libressl_version={}{}{}", major, minor, fix);
- println!("cargo:version=101");
- Version::Libressl
- } else {
blob - a5e7ce230c148875119332494b5e0f37d3fc85ee
file + www/zola/Makefile
--- www/zola/Makefile
+++ www/zola/Makefile
@@ -7,6 +7,7 @@ DISTNAME = zola-0.9.0
GH_ACCOUNT = getzola
GH_PROJECT = zola
GH_TAGNAME = v0.9.0
+REVISION = 0
HOMEPAGE = https://www.getzola.org
@@ -19,12 +20,11 @@ MAINTAINER = Peter H. Ezetta <protocall7@gmail.com>
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB += c c++abi crypto m pthread ssl sass
+WANTLIB += c c++abi crypto m pthread ssl sass onig
-LIB_DEPENDS += www/libsass
+LIB_DEPENDS += www/libsass \
+ textproc/oniguruma
-MAKE_ENV += PKG_CONFIG_ALL_DYNAMIC=1
-
MODULES = devel/cargo
CONFIGURE_STYLE = cargo
@@ -145,7 +145,7 @@ MODCARGO_CRATES += kernel32-sys 0.2.2 # MIT
MODCARGO_CRATES += language-tags 0.2.2 # MIT
MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
MODCARGO_CRATES += lazycell 1.2.1 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
+#MODCARGO_CRATES += libc 0.2.62 # MIT OR Apache-2.0
MODCARGO_CRATES += line-wrap 0.1.1 # Apache-2.0
MODCARGO_CRATES += linked-hash-map 0.5.2 # MIT/Apache-2.0
MODCARGO_CRATES += lock_api 0.1.5 # Apache-2.0/MIT
@@ -355,6 +355,7 @@ MODCARGO_CRATES += yaml-rust 0.4.3 # MIT/Apache-2.0
# use libc >=0.2.63 to support sparc64
MODCARGO_CRATES_UPDATE += libc
+MODCARGO_CRATES += libc 0.2.63 # MIT OR Apache-2.0
PATCHORIG = .openbsd.orig
blob - 7af1e4e6959cb2b2c270fc0f636a5ab953278ef1
file + /dev/null
--- www/zola/patches/patch-modcargo-crates_openssl-sys-0_9_49_build_main_rs
+++ www/zola/patches/patch-modcargo-crates_openssl-sys-0_9_49_build_main_rs
@@ -1,14 +0,0 @@
-$OpenBSD: patch-modcargo-crates_openssl-sys-0_9_49_build_main_rs,v 1.1.1.1 2019/10/29 10:51:50 semarie Exp $
-The LibreSSL version in -current isn't explicitly supported.
-Index: modcargo-crates/openssl-sys-0.9.49/build/main.rs
---- modcargo-crates/openssl-sys-0.9.49/build/main.rs.orig
-+++ modcargo-crates/openssl-sys-0.9.49/build/main.rs
-@@ -202,7 +202,7 @@ See rust-openssl README for more information:
- (2, 9, 0) => ('2', '9', '0'),
- (2, 9, _) => ('2', '9', 'x'),
- (3, 0, 0) => ('3', '0', '0'),
-- _ => version_error(),
-+ _ => ('3', '0', '0'),
- };
-
- println!("cargo:libressl=true");
No comments:
Post a Comment