From patchwork Fri Jun 19 10:54:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 486662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 199B8140271 for ; Fri, 19 Jun 2015 20:54:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6BF23A4134; Fri, 19 Jun 2015 10:54:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lyycFW-evFXX; Fri, 19 Jun 2015 10:54:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 99FBEA4116; Fri, 19 Jun 2015 10:54:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1A22B1C22F6 for ; Fri, 19 Jun 2015 10:54:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 166C092101 for ; Fri, 19 Jun 2015 10:54:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sDt8NBHzY2FP for ; Fri, 19 Jun 2015 10:54:45 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from authsmtp.register.it (authsmtp75.register.it [195.110.101.59]) by whitealder.osuosl.org (Postfix) with ESMTP id 325EC920FB for ; Fri, 19 Jun 2015 10:54:44 +0000 (UTC) Received: from localhost.localdomain ([2.0.68.233]) by paganini34 with id iAuc1q00h51yGcJ01Auhm8; Fri, 19 Jun 2015 12:54:42 +0200 X-Rid: benoit@wsystem.com@2.0.68.233 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: buildroot@buildroot.org Date: Fri, 19 Jun 2015 12:54:33 +0200 Message-Id: <1434711274-49716-1-git-send-email-benoit@wsystem.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH 1/2] openssl: support building the binary without MMU X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The commit 720893b62510438237b9923d744dd079ddb4f67d "openssl: disable apps for NOMMU" prevented the openssl binary from being built without MMU in order to fix a build failure without fork(). However, openssl is designed to support the lack of fork() with -DHAVE_FORK=0, so allow the openssl binary to be enabled without MMU thanks to this option. Signed-off-by: Benoît Thébaudeau --- package/openssl/Config.in | 3 --- package/openssl/openssl.mk | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/openssl/Config.in b/package/openssl/Config.in index 07859ca..d147c07 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -13,15 +13,12 @@ if BR2_PACKAGE_OPENSSL config BR2_PACKAGE_OPENSSL_BIN bool "openssl binary" - # uses fork() - depends on BR2_USE_MMU depends on !BR2_STATIC_LIBS help Install the openssl binary to the target file system. This is a command line tool for doing various crypthographic stuff. comment "openssl binary needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU depends on BR2_STATIC_LIBS config BR2_PACKAGE_OPENSSL_ENGINES diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index fd8904d..34a9830 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -22,6 +22,10 @@ endef OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS endif +ifeq ($(BR2_USE_MMU),) +OPENSSL_CFLAGS += -DHAVE_FORK=0 +endif + ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS OPENSSL_DEPENDENCIES += cryptodev-linux