From patchwork Tue Feb 24 10:53:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 442913 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 5E884140182 for ; Tue, 24 Feb 2015 21:53:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 943E2A2E8A; Tue, 24 Feb 2015 10:53:37 +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 0SKmVL-6yzkf; Tue, 24 Feb 2015 10:53:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 94501A2EA1; Tue, 24 Feb 2015 10:53:35 +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 2F1121BFF13 for ; Tue, 24 Feb 2015 10:53:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1129E33419 for ; Tue, 24 Feb 2015 10:53:34 +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 mNBeUVKHOOJV for ; Tue, 24 Feb 2015 10:53:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by silver.osuosl.org (Postfix) with ESMTPS id 61C8031032 for ; Tue, 24 Feb 2015 10:53:33 +0000 (UTC) Received: by pabkq14 with SMTP id kq14so35234120pab.3 for ; Tue, 24 Feb 2015 02:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BZmvX1nj7r8/eWFgFnJ8TJqyi9EDydSVcnV/Uy2yai0=; b=bnJVFhIakhwGutlM/05/xgLR9zpL39x7HRdCZ1VaW+rTfisFEpwXbXTltpe69zj3YN Lq2RcgSohZXDuZbJqNFKKq5NZxKgn3vhQVz/ECtXSIB2Wa6h4QTJBOc42/csuOxAimad FjFaDGiLAHTuPJs6I7gcAUdGqbEV6bubQBM5wzpu+oUTV3HcTdzfrmqs1GRhzzggEozq 713esEqSleqmpft6fyc24l4RkImbSoTXMrbrMqV1XZOWPz0uxCu7ZjD/hnY58Z1GjKpb e4y7oVob/RsPg+cpwF70R5rFmZ4qrlUpNtzG81Ueu/0WrMKB/T0aDHt3bYH9YJ/orgxb aGlg== X-Received: by 10.70.129.200 with SMTP id ny8mr27900844pdb.17.1424775213095; Tue, 24 Feb 2015 02:53:33 -0800 (PST) Received: from ld2077.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPSA id 2sm11562011pdp.0.2015.02.24.02.53.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 02:53:32 -0800 (PST) From: Fabio Porcedda X-Google-Original-From: Fabio Porcedda To: buildroot@uclibc.org Date: Tue, 24 Feb 2015 11:53:18 +0100 Message-Id: <1424775198-1787-2-git-send-email-Fabio.Porcedda@gmail.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1424775198-1787-1-git-send-email-Fabio.Porcedda@gmail.com> References: <1424775198-1787-1-git-send-email-Fabio.Porcedda@gmail.com> Cc: Axel Lin Subject: [Buildroot] [PATCH master 2/2] logrotate: use pkg-config for the opt library 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" From: Fabio Porcedda Without using the pkg-config the dependencies are not included for a static linking so it fails to build. These failures are fixed by linking the libintl library that is a dependency of the opt library. Fixes: http://autobuild.buildroot.net/results/159bf5730414ca7f73dcdae95090177355193636 http://autobuild.buildroot.net/results/ebe6ab7fc0f2cff98de06b3dc374730da9e9e4f2 Signed-off-by: Fabio Porcedda --- ...fig-to-retrive-ldflags-to-use-the-opt-lib.patch | 29 ++++++++++++++++++++++ package/logrotate/logrotate.mk | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 package/logrotate/0001-Use-pkg-config-to-retrive-ldflags-to-use-the-opt-lib.patch diff --git a/package/logrotate/0001-Use-pkg-config-to-retrive-ldflags-to-use-the-opt-lib.patch b/package/logrotate/0001-Use-pkg-config-to-retrive-ldflags-to-use-the-opt-lib.patch new file mode 100644 index 0000000..9dd2f9e --- /dev/null +++ b/package/logrotate/0001-Use-pkg-config-to-retrive-ldflags-to-use-the-opt-lib.patch @@ -0,0 +1,29 @@ +From 1bb790f79a6ed200436f5fcbfa04000af730c023 Mon Sep 17 00:00:00 2001 +From: Fabio Porcedda +Date: Tue, 24 Feb 2015 11:06:01 +0100 +Subject: [PATCH] Use pkg-config to retrive ldflags to use the opt library + +Using pkg-config the dependency are automatically added for a static +linking, e.g. the libintl. + +Signed-off-by: Fabio Porcedda +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 64cc601..05d54ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLA + PROG = logrotate + MAN = logrotate.8 + MAN5 = logrotate.conf.5 +-LOADLIBES = -lpopt ++LOADLIBES = $(shell pkg-config --libs popt) + SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate + SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate + SVNTAG = r$(subst .,-,$(VERSION)) +-- +2.3.0 + diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index dc26d85..b420d9d 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -9,10 +9,11 @@ LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate LOGROTATE_LICENSE = GPLv2+ LOGROTATE_LICENSE_FILES = COPYING -LOGROTATE_DEPENDENCIES = popt +LOGROTATE_DEPENDENCIES = popt host-pkgconf define LOGROTATE_BUILD_CMDS - $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" LDFLAGS="$(LDFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" -C $(@D) endef define LOGROTATE_INSTALL_TARGET_CMDS