From patchwork Tue Sep 9 18:29:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ANDY KENNEDY X-Patchwork-Id: 387422 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 932141400D5 for ; Wed, 10 Sep 2014 04:29:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B25E794BD1; Tue, 9 Sep 2014 18:29:38 +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 8Ju7KPpUURkq; Tue, 9 Sep 2014 18:29:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2725594BD3; Tue, 9 Sep 2014 18:29:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6C04C1C1ECD for ; Tue, 9 Sep 2014 18:29:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 674FF94BD3 for ; Tue, 9 Sep 2014 18:29: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 yRLtE5EG9Efn for ; Tue, 9 Sep 2014 18:29:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from p01c12o144.mxlogic.net (p01c12o144.mxlogic.net [208.65.145.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 472F494BD1 for ; Tue, 9 Sep 2014 18:29:35 +0000 (UTC) Received: from unknown [76.164.174.82] (EHLO ex-hc3.corp.adtran.com) by p01c12o144.mxlogic.net(mxl_mta-8.1.0-0) over TLS secured channel with ESMTP id c074f045.0.12665.00-324.35291.p01c12o144.mxlogic.net (envelope-from ); Tue, 09 Sep 2014 12:29:35 -0600 (MDT) X-MXL-Hash: 540f470f18215816-c37647412889454dde6b7fa8c1b73fbfb3913bf3 Received: from ex-mb3.corp.adtran.com ([fe80::60aa:f95:ad49:a0f1]) by ex-hc3.corp.adtran.com ([fe80::3892:20fa:600f:75c6%15]) with mapi id 14.03.0195.001; Tue, 9 Sep 2014 13:29:31 -0500 From: ANDY KENNEDY To: "buildroot@uclibc.org" Thread-Topic: [PATCH] openssh: fix static linking Thread-Index: Ac/MXAAM2oCFIoVPQteqfsej/vU4Dg== Date: Tue, 9 Sep 2014 18:29:31 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.22.115.180] MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=UsR3NoAB c=1 sm=1 tr=0 a=J+LXdEUA8t8MtBPt16/Qbg==] X-AnalysisOut: [:117 a=J+LXdEUA8t8MtBPt16/Qbg==:17 a=jVZbIDv9xUMA:10 a=PmH] X-AnalysisOut: [WnSDq-B8A:10 a=qZHQZMT3apYA:10 a=C3ZOIDTcl6cA:10 a=BLceEmw] X-AnalysisOut: [cHowA:10 a=kj9zAlcOel0A:10 a=xqWC_Br6kY4A:10 a=eJNrpioGAAA] X-AnalysisOut: [A:8 a=YlVTAMxIAAAA:8 a=3tcz3bTJAAAA:8 a=6VYGAeNRH_D_Vw8q9H] X-AnalysisOut: [UA:9 a=CjuIK1q_8ugA:10 a=DvnSUQUdWHYA:10] X-Spam: [F=0.5500000000; CM=0.500; MH=0.550(2014090920); S=0.200(2014051901)] X-MAIL-FROM: X-SOURCE-IP: [76.164.174.82] Subject: [Buildroot] [PATCH] openssh: fix static linking 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net When BR2_PREFER_STATIC_LIB is set, openssl is a static library, openssh attempts to build dynamically as the LDFLAGS are dropped out of this build. If PREFER_STATIC is set, add back in --static to the LDFLAGS of openssh to make the linker happy. Signed-off-by: Andy Kennedy diff -Naur a/package/openssh/openssh.mk b/package/openssh/openssh.mk --- a/package/openssh/openssh.mk 2014-02-27 14:51:23.000000000 -0600 +++ b/package/openssh/openssh.mk 2014-09-09 12:09:57.043850866 -0500 @@ -6,10 +6,18 @@ OPENSSH_VERSION = 6.5p1 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" +OPENSSH_CONF_ENV = LD="$(TARGET_CC)" OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \ --disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip +OPENSSH_LDFLAGS_FOR_CONF = $(TARGET_CFLAGS) + +ifeq ($(BR2_PREFER_STATIC_LIB),y) +OPENSSH_LDFLAGS_FOR_CONF += --static +endif + +OPENSSH_CONFIGURE_ENV += LDFLAGS="$(OPENSSH_LDFLAGS_FOR_CONF)" + OPENSSH_DEPENDENCIES = zlib openssl ifeq ($(BR2_PACKAGE_LINUX_PAM),y)