Page MenuHomeFreeBSD
Files F153179009

D41879.diff
No OneTemporary
Actions

D41879.diff
View Options

diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2980,7 +2980,7 @@
${_+_}cd ${.CURDIR}; \
${MAKE} -f Makefile.inc1 _prereq_libs; \
${MAKE} -f Makefile.inc1 _startup_libs; \
- ${MAKE} -f Makefile.inc1 _prebuild_libs; \
+ ${MAKE} -f Makefile.inc1 _prebuild_libs -DLIBCRYPTO_WITHOUT_SUBDIRS; \
${MAKE} -f Makefile.inc1 _generic_libs
#
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -1,6 +1,8 @@
SHLIBDIR?= /lib
+.if !defined(LIBCRYPTO_WITHOUT_SUBDIRS)
SUBDIR= engines modules
+.endif
.include <bsd.own.mk>
.include <src.opts.mk>
diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc
--- a/secure/lib/libcrypto/engines/Makefile.inc
+++ b/secure/lib/libcrypto/engines/Makefile.inc
@@ -16,6 +16,8 @@
.endif
CFLAGS+= -DNDEBUG
+LIBADD= crypto
+
.PATH: ${LCRYPTO_SRC}/engines
WARNS?= 0
diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile
--- a/secure/lib/libcrypto/modules/legacy/Makefile
+++ b/secure/lib/libcrypto/modules/legacy/Makefile
@@ -1,5 +1,6 @@
SHLIB_NAME?= legacy.so
+LIBADD= crypto
SRCS+= legacyprov.c prov_running.c

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 3:31 PM (16 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31796202
Default Alt Text
D41879.diff (1 KB)

Event Timeline