From patchwork Fri Dec 26 17:29:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 424152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 014661400DD for ; Sat, 27 Dec 2014 04:40:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E5B8A88FE2; Fri, 26 Dec 2014 17:40:32 +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 ZW8xjJrqFf6L; Fri, 26 Dec 2014 17:40:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CE4D288B7A; Fri, 26 Dec 2014 17:40:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 403351BFA9F for ; Fri, 26 Dec 2014 17:40:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3A2FC2F74E for ; Fri, 26 Dec 2014 17:40:28 +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 SxygeuG5pu7f for ; Fri, 26 Dec 2014 17:40:26 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by silver.osuosl.org (Postfix) with ESMTPS id A93B32F6CC for ; Fri, 26 Dec 2014 17:40:26 +0000 (UTC) Received: from localhost.localdomain (unknown [88.184.220.198]) by smtp6-g21.free.fr (Postfix) with ESMTP id D3608822C8; Fri, 26 Dec 2014 18:39:19 +0100 (CET) From: Romain Naour To: buildroot@buildroot.org Date: Fri, 26 Dec 2014 18:29:42 +0100 Message-Id: <1419614983-8105-1-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 1.9.3 Subject: [Buildroot] [PATCH 1/2] package/lftp: don't use host's path 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" lftp try to link with -L/usr/lib/lftp/$(LFTP_VERSION) if DESTDIR is not set. When DESTDIR is set to STAGING_DIR, it link with -L$(STAGING_DIR)/usr/lib/lftp/$(LFTP_VERSION) Signed-off-by: Romain Naour --- package/lftp/lftp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index 1586579..73e3087 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -45,6 +45,10 @@ LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_FTP) += proto-ftp.so LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_HTTP) += proto-http.so LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_SFTP) += proto-sftp.so +# Set DESTDIR to STAGING_DIR during the build to avoid linking +# with -L/usr/lib/lftp/$(LFTP_VERSION) +LFTP_MAKE_ENV += DESTDIR="$(STAGING_DIR)" + define LFTP_REMOVE_MODULES for f in $(LFTP_MODULES_TO_REMOVE-) ; do \ $(RM) -f $(TARGET_DIR)/usr/lib/lftp/$(LFTP_VERSION)/$$f ; \