Page MenuHomeFreeBSD
Files F137668442

D53043.id164372.diff
No OneTemporary
Actions

D53043.id164372.diff
View Options

diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile
--- a/crypto/openssl/BSDmakefile
+++ b/crypto/openssl/BSDmakefile
@@ -48,32 +48,12 @@
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
--- 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");
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -3,9 +3,6 @@
PACKAGE= openssl
LIB_PACKAGE=
-# OpenSSL version used for manual page generation
-.include "Makefile.version"
-
LCRYPTO_SRC= ${SRCTOP}/crypto/openssl
LCRYPTO_DOC= ${LCRYPTO_SRC}/doc
@@ -15,10 +12,7 @@
CFLAGS+= -I${LCRYPTO_SRC}/providers/fips/include
CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include
-.include "Makefile.common"
+.SUFFIXES: .pc
+.PATH.pc: ${LCRYPTO_SRC}/exporters
-.for pcfile in ${PCFILES}
-${pcfile}: ${pcfile}.in
- sed -e 's,@openssl_ver@,${OPENSSL_VER},g' ${.ALLSRC} > ${.TARGET}
-.endfor
-CLEANFILES+= ${PCFILES}
+.include "Makefile.common"
diff --git a/secure/lib/libcrypto/Makefile.version b/secure/lib/libcrypto/Makefile.version
deleted file mode 100644
--- a/secure/lib/libcrypto/Makefile.version
+++ /dev/null
@@ -1,2 +0,0 @@
-OPENSSL_VER= 3.5.4
-OPENSSL_DATE= 2025-09-30

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 25, 8:36 PM (3 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26174252
Default Alt Text
D53043.id164372.diff (3 KB)

Event Timeline