From owner-svn-src-all@freebsd.org Fri Nov 6 17:39:19 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98773A27095; Fri, 6 Nov 2015 17:39:19 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6FB5C1156; Fri, 6 Nov 2015 17:39:19 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA6HdIDS091247; Fri, 6 Nov 2015 17:39:18 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA6HdItd091243; Fri, 6 Nov 2015 17:39:18 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201511061739.tA6HdItd091243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 6 Nov 2015 17:39:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290460 - in head/secure: lib/libcrypto lib/libssl usr.bin/openssl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2015 17:39:19 -0000 Author: jkim Date: Fri Nov 6 17:39:17 2015 New Revision: 290460 URL: https://svnweb.freebsd.org/changeset/base/290460 Log: Clean up OpenSSL makefiles. Modified: head/secure/lib/libcrypto/Makefile head/secure/lib/libcrypto/Makefile.inc head/secure/lib/libssl/Makefile head/secure/usr.bin/openssl/Makefile Modified: head/secure/lib/libcrypto/Makefile ============================================================================== --- head/secure/lib/libcrypto/Makefile Fri Nov 6 17:29:51 2015 (r290459) +++ head/secure/lib/libcrypto/Makefile Fri Nov 6 17:39:17 2015 (r290460) @@ -14,12 +14,12 @@ NO_LINT= .if exists(Makefile.man) .include "Makefile.man" .endif +.include "Makefile.inc" + .if defined(NOTYET) MAN+= config.5 des_modes.7 .endif -.include "Makefile.inc" - # base sources SRCS= cpt_err.c cryptlib.c cversion.c ex_data.c mem.c mem_dbg.c o_dir.c \ o_fips.c o_init.c o_str.c o_time.c uid.c @@ -380,6 +380,8 @@ INCSDIR= ${INCLUDEDIR}/openssl CSTD= gnu89 +CFLAGS+= -I${.OBJDIR} +CFLAGS+= -I${LCRYPTO_SRC}/crypto CFLAGS+= -I${LCRYPTO_SRC}/crypto/asn1 CFLAGS+= -I${LCRYPTO_SRC}/crypto/evp CFLAGS+= -I${LCRYPTO_SRC}/crypto/modes @@ -391,32 +393,32 @@ AFLAGS+= --noexecstack ACFLAGS+= -Wa,--noexecstack .endif +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +OPENSSLCONF_H= opensslconf-x86.h +.else +OPENSSLCONF_H= opensslconf-${MACHINE_CPUARCH}.h +.endif + CLEANFILES= buildinf.h opensslconf.h -buildinf.h: ${.CURDIR}/Makefile +buildinf.h: Makefile ( echo "#ifndef MK1MF_BUILD"; \ echo " /* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */"; \ echo " #define CFLAGS \"compiler: ${COMPILER_TYPE}\""; \ echo " #define PLATFORM \"platform: FreeBSD-${MACHINE_ARCH}\""; \ echo "#endif" ) > ${.TARGET} -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" -opensslconf.h: opensslconf-x86.h -.else -opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h -.endif - ${CP} ${.ALLSRC} ${.TARGET} +opensslconf.h: ${OPENSSLCONF_H} + ${CP} ${.IMPSRC} ${.TARGET} .include .if ${MACHINE_CPUARCH} == "amd64" -.PATH: ${.CURDIR}/amd64 -.elif ${MACHINE_CPUARCH} == "i386" -.PATH: ${.CURDIR}/i386 +_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm .endif -.if ${MACHINE_CPUARCH} == "amd64" -_bn_asmpath= ${LCRYPTO_SRC}/crypto/bn/asm +.if exists(${.CURDIR}/${MACHINE_CPUARCH}) +.PATH: ${.CURDIR}/${MACHINE_CPUARCH} .endif .PATH: ${LCRYPTO_SRC}/crypto \ Modified: head/secure/lib/libcrypto/Makefile.inc ============================================================================== --- head/secure/lib/libcrypto/Makefile.inc Fri Nov 6 17:29:51 2015 (r290459) +++ head/secure/lib/libcrypto/Makefile.inc Fri Nov 6 17:39:17 2015 (r290460) @@ -7,10 +7,10 @@ OPENSSL_VER= 1.0.2d OPENSSL_DATE= 2015-07-09 LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl -LCRYPTO_DOC= ${.CURDIR}/../../../crypto/openssl/doc +LCRYPTO_DOC= ${LCRYPTO_SRC}/doc +CFLAGS+= -I${LCRYPTO_SRC} CFLAGS+= -DTERMIOS -DANSI_SOURCE -CFLAGS+= -I${LCRYPTO_SRC} -I${LCRYPTO_SRC}/crypto -I${.OBJDIR} CFLAGS+= -DOPENSSL_THREADS -DDSO_DLFCN -DHAVE_DLFCN_H .include Modified: head/secure/lib/libssl/Makefile ============================================================================== --- head/secure/lib/libssl/Makefile Fri Nov 6 17:29:51 2015 (r290459) +++ head/secure/lib/libssl/Makefile Fri Nov 6 17:39:17 2015 (r290460) @@ -23,6 +23,8 @@ INCSDIR=${INCLUDEDIR}/openssl LIBADD= crypto +CFLAGS+= -I${LCRYPTO_SRC}/crypto + .include .PATH: ${LCRYPTO_SRC}/ssl \ Modified: head/secure/usr.bin/openssl/Makefile ============================================================================== --- head/secure/usr.bin/openssl/Makefile Fri Nov 6 17:29:51 2015 (r290459) +++ head/secure/usr.bin/openssl/Makefile Fri Nov 6 17:39:17 2015 (r290460) @@ -9,7 +9,7 @@ LIBADD= ssl crypto .endif .include "../../lib/libcrypto/Makefile.inc" -CFLAGS+=-DMONOLITH -I${.CURDIR} +CFLAGS+= -DMONOLITH SRCS+= app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \ dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c \