From patchwork Sun Mar 1 21:06:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 444861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id B8A221401AC for ; Mon, 2 Mar 2015 08:07:16 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=qsUR3XJd; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C87C09125C; Sun, 1 Mar 2015 21:07:15 +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 gT6D5JK34GhQ; Sun, 1 Mar 2015 21:07:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CFD991557; Sun, 1 Mar 2015 21:07:09 +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 5C0901C2433 for ; Sun, 1 Mar 2015 21:07:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 597D694D95 for ; Sun, 1 Mar 2015 21:07:05 +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 ncJ37pU70vy9 for ; Sun, 1 Mar 2015 21:07:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by hemlock.osuosl.org (Postfix) with ESMTPS id B216D94D8A for ; Sun, 1 Mar 2015 21:07:02 +0000 (UTC) Received: by wevk48 with SMTP id k48so29802800wev.0 for ; Sun, 01 Mar 2015 13:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=DzkvYoFpJbtt7Ys53lLTl3zF5JVvbUsdToSGWWPbRqk=; b=qsUR3XJdMYZ0VZIfqMkDJ7gZIyceiZFaZO5t2FAtqgqrt/26xw53MRtn1/CWD+qfyJ q/dL2ESCVHq4GAB1i+Kl+JLCm0MWZn+ph77ImzVWvfAAhpRNkArmY/jkDXjzZLGVcj9U m9KPIbb+MCLQB6zWS9/OO/XIC5FKNWMM8srhBbPDGdO0Oz2TKILBjnGRW+R5OBLo38lO +zxhS6w4h91wLREJktTllDECts6fPuVKH4f9G6dljc0cY4LmFR94w3JVf8X8lxyeNEN5 TykVGu0IiaqLutX3spn5mnFaYDLnk/Kh6FNKsQ+DBRyKtq+hifsN0ScaH5FV27daRsNz 3Ghw== X-Received: by 10.194.78.72 with SMTP id z8mr53325820wjw.0.1425244021368; Sun, 01 Mar 2015 13:07:01 -0800 (PST) Received: from mobeast.localdomain (dynamic-adsl-78-15-134-179.clienti.tiscali.it. [78.15.134.179]) by mx.google.com with ESMTPSA id ha5sm13149361wib.1.2015.03.01.13.06.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Mar 2015 13:07:00 -0800 (PST) From: Fabio Porcedda To: buildroot@uclibc.org Date: Sun, 1 Mar 2015 22:06:52 +0100 Message-Id: <1425244013-2509-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.3.1 In-Reply-To: <1425244013-2509-1-git-send-email-fabio.porcedda@gmail.com> References: <1425244013-2509-1-git-send-email-fabio.porcedda@gmail.com> Subject: [Buildroot] [PATCH v3 1/2] popt: add to the "popt.pc" file the libintl 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" This change permits through pkg-config to retrive even the depenencies that is useful for a static linking. Signed-off-by: Fabio Porcedda --- ...-the-libintl-library-to-the-Libs.private-.patch | 47 ++++++++++++++++++++++ package/popt/popt.mk | 4 ++ 2 files changed, 51 insertions(+) create mode 100644 package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch diff --git a/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch b/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch new file mode 100644 index 0000000..9b0b07e --- /dev/null +++ b/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch @@ -0,0 +1,47 @@ +From 470755ccc353b59107c957972d908cbde4942c8d Mon Sep 17 00:00:00 2001 +From: Fabio Porcedda +Date: Sun, 1 Mar 2015 21:13:48 +0100 +Subject: [PATCH] popt.pc: add the libintl library to the Libs.private field + +If static linking and libintl is used, the program that uses the popt +library needs to link to the libintl library too so add the libintl +library to the libs.private field because is useful for programs that call + pkg-config --static --libs popt +they get the libintl library too: + -L<...> -lpopt -lintl + +This patch was already sent upstream: +http://rpm5.org/community/popt-devel/0294.html + +Signed-off-by: Fabio Porcedda +--- + configure.ac | 1 + + popt.pc.in | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index e8eb238..816d272 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -90,6 +90,7 @@ popt_sysconfdir="${sysconfdir}" + eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix} + AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory]) + ++AC_SUBST([POPT_PKGCONFIG_LIBS_PRIVATE],"$LIBINTL") + + # Define a (hope) portable Libs pkgconfig directive that + # - Don't harm if the default library search path include ${libdir} +diff --git a/popt.pc.in b/popt.pc.in +index a86437c..0acfdb9 100644 +--- a/popt.pc.in ++++ b/popt.pc.in +@@ -6,5 +6,6 @@ includedir=@includedir@ + Name: popt + Version: @VERSION@ + Description: popt library. ++Libs.private: @POPT_PKGCONFIG_LIBS_PRIVATE@ + Libs: @POPT_PKGCONFIG_LIBS@ + Cflags: -I${includedir} +-- +2.3.1 + diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 8ce64d4..605649b 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -13,6 +13,10 @@ POPT_LICENSE_FILES = COPYING POPT_AUTORECONF = YES POPT_GETTEXTIZE = YES +ifeq ($(BR2_PACKAGE_GETTEXT),y) +POPT_DEPENDENCIES += gettext +endif + POPT_CONF_ENV = ac_cv_va_copy=yes ifeq ($(BR2_PACKAGE_LIBICONV),y)