From patchwork Mon Jul 22 07:11:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1134738 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="syZf6OGw"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45sXqF4cyVz9s3l for ; Mon, 22 Jul 2019 17:12:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5E4F585B71; Mon, 22 Jul 2019 07:12:06 +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 pBxvhIsNG4Xm; Mon, 22 Jul 2019 07:12:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B05185B5C; Mon, 22 Jul 2019 07:12:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 625E21BF3AE for ; Mon, 22 Jul 2019 07:12:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5F6688777B for ; Mon, 22 Jul 2019 07:12:02 +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 r5CJS8Ac0d3w for ; Mon, 22 Jul 2019 07:11:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6CFA587568 for ; Mon, 22 Jul 2019 07:11:59 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id v22so27837733qkj.8 for ; Mon, 22 Jul 2019 00:11:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=UfH+2JGNvyDQ9PdiXZzFEXB4iBRjpUBizDcom0Y4Dwc=; b=syZf6OGw/LNHxn1NJtZylR8argOPp19AAqGRk0nHDz23ZY/KY4KrOQZjeCrCOL0cCS KtuQ70G5yY4IsAJk3KK4rgs6d0CsGA6F3DXPEeYJQd9FVnU1+SzeWaoPWejFdbITrM/P doBkuPxEs3rUDEVw2WWCeCDvSHNA7Yzcy46vUNKTR3kV3Wei3IC4TNpe5n3cnEsqeCK6 P+ROGAiLUlg9LQ+/aW1IQYebre4/2QQ0bvdYp3wsgRKxUhl2LOimaoCiED2yh/mQ70ry VsZvEMHjmvi5l4CgCvFse4ZEWG/qZMfibj5qjLfRYr8qb0JPBmzu3D/YiCD6gCygU94L oPlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UfH+2JGNvyDQ9PdiXZzFEXB4iBRjpUBizDcom0Y4Dwc=; b=kfU0kaTNwr7DopCdvNWFJBtDuXvl1NUmCj++Qc0cn3IlZ2C9YRN0jP+rMuywR2Zn6H PTHMJLO6jVSR6VXWQw4Kccl83AzgUm9zoT7KXCk8XsFu86koWKmk7ynZuLwelyfkHjLm Zv+pgRTIbn7GUvlQhEKmPIOYBR5LsnP6S/jxkv2BWxa4QaYPb0Q8jun4ChL5u9wfu1Bh rM+J9GwToDrZ2y7vf9T/jTL06s6KusWZphmtIDyIn5H1hnOQK/TsTKl+uTv4VldYL18s N3BxjRYcvAr6vmCxKuZ8sJOdb+okYWL9rjP+XIn3VP/IcN2ISE2EHIXHSeE5F/ZSlvou dSJQ== X-Gm-Message-State: APjAAAVW4WQfrINmGfAujlv+vxZCDZ0qm7WZ2up6IW8yQXzin7ZJlBB5 m3SfYdAGbSp1GHFqGk7DGCc/2GmNvnw= X-Google-Smtp-Source: APXvYqyl51bkm2gRXtGMMN8cyNO3xIxHEUzoozcu2UyLml4Hty88/+oi4jW2qf0wpuNcyOVdiuLNMQ== X-Received: by 2002:ae9:ed4b:: with SMTP id c72mr45855422qkg.400.1563779518255; Mon, 22 Jul 2019 00:11:58 -0700 (PDT) Received: from casantos.remote.csb ([191.35.195.92]) by smtp.gmail.com with ESMTPSA id b7sm17258017qtt.38.2019.07.22.00.11.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 22 Jul 2019 00:11:57 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Mon, 22 Jul 2019 04:11:46 -0300 Message-Id: <20190722071146.30199-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH] package/cups-filters: fix build without NLS X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Olivier Schonken MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos texttotext must be linked to libiconv if !BR2_ENABLE_LOCALE so patch Makefile.am to add the required -liconv argument. We could patch configure.ac to use AM_ICONV but it would require more change adding AM_GNU_GETTEXT_VERSION([x.y.z]) to bring iconv.m4. Fixes: https://bugs.busybox.net/show_bug.cgi?id=12031 Signed-off-by: Carlos Santos --- package/cups-filters/cups-filters.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 214647a90e..8368be5e4b 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -13,6 +13,17 @@ CUPS_FILTERS_AUTORECONF = YES CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg +# texttotext must be linked to libiconv if !BR2_ENABLE_LOCALE. We could patch +# configure.ac to use AM_ICONV but it would require iconv.m4, increasing the +# patch size by at least 130 lines. Let's keep it simple and just patch +# Makefile.am to append -liconv to the link command line. +ifeq ($(BR2_PACKAGE_LIBICONV),y) +define CUPS_FILTERS_LINK_LIBICONV + $(SED) '/texttotext_LDADD =/s/(CUPS_LIBS)$$/(CUPS_LIBS) -liconv/' $(@D)/Makefile.am +endef +CUPS_FILTERS_PRE_CONFIGURE_HOOKS += CUPS_FILTERS_LINK_LIBICONV +endif + CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ --disable-mutool \ --disable-foomatic \