From patchwork Fri Sep 6 01:04:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 273009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4031F2C00BC for ; Fri, 6 Sep 2013 11:04:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id AAD7193916; Fri, 6 Sep 2013 01:05:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VZRsUD9tYMMS; Fri, 6 Sep 2013 01:05:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 22223936FE; Fri, 6 Sep 2013 01:05:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B42E71BFA8B for ; Fri, 6 Sep 2013 01:04:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AD7128C00B for ; Fri, 6 Sep 2013 01:04:41 +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 75B+QrSStojY for ; Fri, 6 Sep 2013 01:04:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs02.rockwellcollins.com (secvs02.rockwellcollins.com [205.175.225.241]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0E5748B7C9 for ; Fri, 6 Sep 2013 01:04:40 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO collinscrsmtp02.rockwellcollins.com) ([131.198.63.133]) by mail-virt.rockwellcollins.com with ESMTP; 05 Sep 2013 20:04:40 -0500 Received: from ares ([131.198.63.11]) by collinscrsmtp02.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2013090520043983-751716 ; Thu, 5 Sep 2013 20:04:39 -0500 From: Ryan Barnett To: buildroot@busybox.net Date: Thu, 5 Sep 2013 20:04:17 -0500 Message-Id: <1378429464-12546-4-git-send-email-rjbarnet@rockwellcollins.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1378429464-12546-1-git-send-email-rjbarnet@rockwellcollins.com> References: <1378429464-12546-1-git-send-email-rjbarnet@rockwellcollins.com> X-MIMETrack: Itemize by SMTP Server on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/05/2013 08:04:39 PM, Serialize by Router on CollinsCRSMTP02/CedarRapids/RockwellCollins(Release 8.5.2FP2 HF162|May 16, 2011) at 09/05/2013 08:04:39 PM, Serialize complete at 09/05/2013 08:04:39 PM X-TNEFEvaluated: 1 Subject: [Buildroot] [PATCH 03/10] sysvinit: add patch for libcrypt X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Adding a patch to sysvinit to correcctly add libcrypt as a build dependancy of sysvinit. Signed-off-by: Ryan Barnett --- .../sysvinit-0001-libcrypt_check_fix.patch | 13 +++++++++++++ package/sysvinit/sysvinit.mk | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) create mode 100644 package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch diff --git a/package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch b/package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch new file mode 100644 index 0000000..f6f54e5 --- /dev/null +++ b/package/sysvinit/sysvinit-0001-libcrypt_check_fix.patch @@ -0,0 +1,13 @@ +--- a/src/Makefile 2010-04-11 04:30:27.000000000 -0500 ++++ b/src/Makefile 2012-09-05 12:44:45.000000000 -0500 +@@ -78,8 +78,8 @@ + endif + + # Additional libs for GNU libc. +-ifneq ($(wildcard /usr/lib*/libcrypt.a),) +- SULOGINLIBS += -lcrypt ++ifneq ($(LCRYPT),) ++ SULOGINLIBS += $(LCRYPT) + endif + + all: $(BIN) $(SBIN) $(USRBIN) diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index c6b75a0..7678bce 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -31,7 +31,7 @@ SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES define SYSVINIT_BUILD_CMDS # Force sysvinit to link against libcrypt as it otherwise # use an incorrect test to see if it's available - $(MAKE) $(TARGET_CONFIGURE_OPTS) SULOGINLIBS="-lcrypt" -C $(@D)/src + $(MAKE) $(TARGET_CONFIGURE_OPTS) LCRYPT="-lcrypt" -C $(@D)/src endef define SYSVINIT_INSTALL_TARGET_CMDS