From patchwork Mon Sep 21 16:10:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joao Pinto X-Patchwork-Id: 520359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 8E8B81401AD for ; Tue, 22 Sep 2015 02:10:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CA28891016; Mon, 21 Sep 2015 16:10:32 +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 8pnzCK+hTCWY; Mon, 21 Sep 2015 16:10:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D3928E29A; Mon, 21 Sep 2015 16:10:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D349E1C1747 for ; Mon, 21 Sep 2015 16:10:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CEE6A3316B for ; Mon, 21 Sep 2015 16:10:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bABYcArFiMis for ; Mon, 21 Sep 2015 16:10:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (smtprelay2.synopsys.com [198.182.60.111]) by silver.osuosl.org (Postfix) with ESMTPS id 316503320A for ; Mon, 21 Sep 2015 16:10:29 +0000 (UTC) Received: from dc8secmta1.synopsys.com (dc8secmta1.synopsys.com [10.13.218.200]) by smtprelay.synopsys.com (Postfix) with ESMTP id 0CD5F10C11DC; Mon, 21 Sep 2015 09:10:28 -0700 (PDT) Received: from dc8secmta1.internal.synopsys.com (dc8secmta1.internal.synopsys.com [127.0.0.1]) by dc8secmta1.internal.synopsys.com (Service) with ESMTP id EDBAA27114; Mon, 21 Sep 2015 09:10:27 -0700 (PDT) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by dc8secmta1.internal.synopsys.com (Service) with ESMTP id C923927102; Mon, 21 Sep 2015 09:10:27 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id B2B882B0; Mon, 21 Sep 2015 09:10:27 -0700 (PDT) Received: from jppCent.internal.synopsys.com (jppcent.internal.synopsys.com [10.107.19.131]) by mailhost.synopsys.com (Postfix) with ESMTP id 45A122AD; Mon, 21 Sep 2015 09:10:25 -0700 (PDT) From: Joao Pinto To: thomas.petazzoni@free-electrons.com, baruch@tkos.co.il Date: Mon, 21 Sep 2015 17:10:15 +0100 Message-Id: <875368a848cb37f12c0c13638c987ce0f7783700.1442850883.git.jpinto@synopsys.com> X-Mailer: git-send-email 1.8.1.5 Cc: Joao Pinto , buildroot@buildroot.org Subject: [Buildroot] [PATCH] sysvinit: arm64 build fix 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" sysvinit was not able to be built for arm64 architectures. The package patch was changed according to the suggestion of Thomas Petazzoni. Signed-off-by: Joao Pinto --- package/sysvinit/0001-fix-libcrypt-test.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/sysvinit/0001-fix-libcrypt-test.patch b/package/sysvinit/0001-fix-libcrypt-test.patch index 207270d..3724110 100644 --- a/package/sysvinit/0001-fix-libcrypt-test.patch +++ b/package/sysvinit/0001-fix-libcrypt-test.patch @@ -1,17 +1,21 @@ Make the libcrypt test somewhat cross-compilation compliant Signed-off-by: Thomas Petazzoni +Signed-off-by: Joao Pinto Index: b/src/Makefile =================================================================== --- a/src/Makefile +++ b/src/Makefile -@@ -78,7 +78,7 @@ +@@ -78,8 +78,9 @@ else endif # Additional libs for GNU libc. -ifneq ($(wildcard /usr/lib*/libcrypt.a),) -+ifneq ($(wildcard $(SYSROOT)/usr/lib*/libcrypt.a),) - SULOGINLIBS += -lcrypt +- SULOGINLIBS += -lcrypt ++HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes && rm -f $$f) ++ifeq ($(HAS_LIBCRYPT),yes) ++ SULOGINLIBS += -lcrypt endif + all: $(BIN) $(SBIN) $(USRBIN)