Page MenuHomeFreeBSD
Files F151018286

D52420.id161698.diff
No OneTemporary
Actions

D52420.id161698.diff
View Options

diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile
--- a/crypto/openssl/BSDmakefile
+++ b/crypto/openssl/BSDmakefile
@@ -23,8 +23,11 @@
.PHONY: configure patch all
.ORDER: configure patch all
+LOCALBASE= /usr/local
+SETENV= env -i PATH=${LOCALBASE}/bin:/bin:/usr/bin
+
configure:
- @cd ${.CURDIR} && \
+ @cd ${.CURDIR} && ${SETENV} \
${PERL} ./Configure \
disable-aria \
disable-egd \
@@ -38,33 +41,44 @@
enable-sctp \
--openssldir=etc \
--prefix=/usr
- @cd ${.CURDIR} && gmake configdata.pm
- @cd ${LCRYPTO_SRC} && ${PERL} \
+ @echo "Building configdata.pm for later use."
+ @cd ${.CURDIR} && \
+ ${SETENV} gmake -j ${.MAKE.JOBS} configdata.pm
+
+ @echo "Populating Makefile.version with release information"
+ @cd ${LCRYPTO_SRC} && ${SETENV} ${PERL} \
${LCRYPTO_SRC}/freebsd/dump_version_from_configdata.pl > \
${SRCTOP}/secure/lib/libcrypto/Makefile.version
all: patch
- # Passing `-j ${.MAKE.JOBS}` doesn't work here for some reason.
- @cd ${.CURDIR} && gmake build_all_generated
+ @echo "==> Building generated files (headers, manpages, etc)"
+ @cd ${.CURDIR} && \
+ ${SETENV} gmake -j ${.MAKE.JOBS} build_all_generated
- # Clean the pkgconfig files:
- # 1. Fix --prefix (not sure why configure --prefix isn't honored properly).
+ # 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 && \
- ${MAKE} cleanasm && \
- ${MAKE} buildasm
+ ${SETENV} ${MAKE} cleanasm && \
+ ${SETENV} ${MAKE} buildasm
+ @echo "==> Syncing manpages (section 1)"
@rsync -a --delete \
--exclude 'Makefile*' --exclude '*.1' \
${LCRYPTO_DOC}/man/ \
${SRCTOP}/secure/lib/libcrypto/man
+ @echo "==> Syncing manpages (sections {3,5,7})"
@rsync -a --delete \
--exclude 'Makefile*' --exclude '*.[357]' \
${LCRYPTO_DOC}/man/man1/ \
@@ -75,8 +89,8 @@
# depending on the host architecture.
patch: configure
# Spam arch-specific overrides to config files.
-
- @cd ${.CURDIR} && gmake ${BN_CONF_H} && \
+ @echo "==> Patching headers"
+ @cd ${.CURDIR} && ${SETENV} gmake ${BN_CONF_H} && \
${MV} ${BN_CONF_H} ${BN_CONF_H_ORIG} && \
${CAT} ${BN_CONF_H}.orig \
${LCRYPTO_SRC}/freebsd/${BN_CONF_H} >> \
@@ -92,7 +106,8 @@
clean: .PHONY
@cd ${.CURDIR} && rm -f ${BN_CONF_H_ORIG} ${CONFIGURATION_H_ORIG}
- @cd ${SRCTOP}/secure/lib/libcrypto && ${MAKE} cleanasm
+ @cd ${SRCTOP}/secure/lib/libcrypto && \
+ ${SETENV} ${MAKE} cleanasm
-@cd ${.CURDIR} && gmake ${.TARGET}

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 11:52 AM (18 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30966369
Default Alt Text
D52420.id161698.diff (2 KB)

Event Timeline