summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2025-10-11 13:47:20 -0700
committerEnji Cooper <ngie@FreeBSD.org>2025-10-16 23:42:13 -0700
commit97388e7215e080f2cb9fd446f4be4e46a9aeb114 (patch)
tree26ef573dfe31edd38f196a10a692bbf4ca3c3fba /crypto
parentd271d2ce152435b14e309bd8b25f47a0f4a2040f (diff)
OpenSSL: install .pc files from the exporters subdir
The .pc files generated in the root directory are used as part of the build; they should never be installed. Use the versions from the exporters subdirectory--which should be installed--as the .pc files which are distributed with FreeBSD. This avoids the need for "fixing up" these files after the fact (see `crypto/openssl/BSDmakefile` for more details as part of this change). Garbage collect `secure/lib/libcrypto/Makefile.version`, et al, as they're orphaned files. They were technically unused prior to this change as the vendor process properly embeds the version numbers in various files, but this commit formalizes the removal. This correction/clarification on the .pc files will be made in an upcoming release of OpenSSL [1]. References: 1. https://github.com/openssl/openssl/issues/28803 Suggested by: Richard Levitte (OpenSSL project) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53043
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssl/BSDmakefile20
-rw-r--r--crypto/openssl/freebsd/dump_version_from_configdata.pl21
2 files changed, 0 insertions, 41 deletions
diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile
index d260808ffac3..a45dc2b532f3 100644
--- a/crypto/openssl/BSDmakefile
+++ b/crypto/openssl/BSDmakefile
@@ -48,32 +48,12 @@ configure:
enable-sctp \
--openssldir=etc \
--prefix=/usr)
- @echo "Building configdata.pm for later use."
- @(cd ${.CURDIR} && \
- ${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} configdata.pm)
-
- @echo "Populating Makefile.version with release information"
- @(cd ${LCRYPTO_SRC} && ${SETENVI} ${WRK_ENV} ${PERL} \
- ${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \
- ${SRCTOP}/secure/lib/libcrypto/Makefile.version)
all: patch
@echo "==> Building generated files (headers, manpages, etc)"
@(cd ${.CURDIR} && \
${SETENVI} ${WRK_ENV} ${GMAKE} -j ${.MAKE.JOBS} build_all_generated)
- # 1. Fix --prefix.
- # a. Not sure why --prefix isn't honored properly, even though it's
- # passed to Configure; the files might be getting rebuilt
- # post-Configure, somehow.
- # 2. Remove duplicate path in CFLAGS.
- # 3. Remove duplicate path in includedir(s).
- @echo "==> Fixing pkgconfig files"
- @find . -name \*.pc -print -exec sed -i '' -E \
- -e 's,^prefix=.+,prefix=/usr,' \
- -e 's,[[:space:]]+(\-I)?\$\{prefix\}/\./include[[:space:]]*,,g' \
- {} +
-
@echo "==> Cleaning / rebuilding ASM"
@(cd ${SRCTOP}/secure/lib/libcrypto && \
${SETENVI} ${WRK_ENV} ${MAKE} cleanasm && \
diff --git a/crypto/openssl/freebsd/dump_version_from_configdata.pl b/crypto/openssl/freebsd/dump_version_from_configdata.pl
deleted file mode 100644
index b6137718ba54..000000000000
--- a/crypto/openssl/freebsd/dump_version_from_configdata.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env perl
-#
-# This dumps out the values needed to generate manpages and other artifacts
-# which include the release version/date.
-#
-# See also: `secure/lib/libcrypto/Makefile.version`.
-
-use Cwd qw(realpath);
-use File::Basename qw(dirname);
-use Time::Piece;
-
-use lib dirname(dirname(realpath($0)));
-
-use configdata qw(%config);
-
-$OPENSSL_DATE = Time::Piece->strptime($config{"release_date"}, "%d %b %Y")->strftime("%Y-%m-%d");
-
-$OPENSSL_VER = "$config{'major'}.$config{'minor'}.$config{'patch'}";
-
-print("OPENSSL_VER=\t${OPENSSL_VER}\n");
-print("OPENSSL_DATE=\t${OPENSSL_DATE}\n");