From patchwork Thu Apr 4 22:47:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1077800 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.136; helo=silver.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="SuO0WYXS"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ZyVx6VLqz9sPW for ; Fri, 5 Apr 2019 09:37:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D3D3E228B3; Thu, 4 Apr 2019 22:37:11 +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 2J7Ln5SGYXQ3; Thu, 4 Apr 2019 22:37:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4D36A230A4; Thu, 4 Apr 2019 22:37:09 +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 D27C61BF97C for ; Thu, 4 Apr 2019 22:37:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CFBF188256 for ; Thu, 4 Apr 2019 22:37:07 +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 DRAJ36blXyPR for ; Thu, 4 Apr 2019 22:37:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id F24A78825E for ; Thu, 4 Apr 2019 22:37:04 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id t4so3543310ljc.2 for ; Thu, 04 Apr 2019 15:37:04 -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=6K1uZ+aDICwQ8026mSGuJ6IaB4eVebYSG48lbqcT6L0=; b=SuO0WYXSQeRQhkmBFPP9xn+u4Fuj0crhk1e/UIrqNygCfhoLecZ3AcxKKYDTxVzJIz IcnUh86DRgzzIgF3E13jVKQR4i/KrrIpkOMW+nKugaIKiFMg/nyxNUk7VF9BbzLJNQIv gLu6eKuaMwbXn+XJmqQ5kAP2JA7HeOSpzHmuYuVpfr4GY0XNiHf8oWpbh7dKmuWyUhAy pv2jUuUfg7BB7VBgU7ZSBS3ORS6dzPtWUODgw90IDyIGrzQl4ZOKNhigflMcN9yXsQEC QfgtfWqc5dW34+5sTMO4icqSkXA6fkYVvH4MHF2a8FtZzfX2EV7dopFJoK7uKP9ZUhic WORA== 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=6K1uZ+aDICwQ8026mSGuJ6IaB4eVebYSG48lbqcT6L0=; b=JT6Enu7BbXsBchnTm9NwDymxuve1U1KKhJKInz3Pm/Nk8VePm5NyRDGE76LCy3UerD T7k/Z/DWCrZeoWMnRxnbcP47lsXW1HPi769JQflzLddBb51aYrROtHWcitXnT0QcQzye ZlF5w6dgmmJBPziOJzlJn3l7TsgRDeqHHk71v0z1rWtoGQldOMDKHdmOf4uAqomlOKD7 8rHxB2YAWzcpvKbKGO1OucktA08Jz6WHWVEB09zYXHL7ArKVjbXw1oZQQTZKmOA+NwId HQ0GfmGL26UWs3CAW3ZScappBSPSlHiDuslmkmIbya2mYbAkZPVmcTO2Ei0ZrMC9vcG1 Htiw== X-Gm-Message-State: APjAAAXibrBOnb179VOvWtMTrmKsucCzC52nelaZJ8xkPFeX0mZX2/xL i5DHglsG/gaDXhAYcLrp1G8z8TqB X-Google-Smtp-Source: APXvYqzG2wPtl0+/A7A3XCPzeVsGsXQS37h0PRF/b24HSx6/Q+WnN4DEv4IuvhtBbGPUbew+Xi/EWA== X-Received: by 2002:a2e:3512:: with SMTP id z18mr4716171ljz.25.1554417422883; Thu, 04 Apr 2019 15:37:02 -0700 (PDT) Received: from vkochan-ThinkPad-T470p.lan ([93.75.250.209]) by smtp.gmail.com with ESMTPSA id o27sm3918167lfi.25.2019.04.04.15.37.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 15:37:02 -0700 (PDT) From: Vadim Kochan To: buildroot@buildroot.org Date: Fri, 5 Apr 2019 01:47:00 +0300 Message-Id: <20190404224700.1346-1-vadim4j@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] infra/Makefile.in: Fix format_arg issues after bump gettext-tiny to c6dcdcd 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: Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" After bump gettext-tiny to c6dcdcd there was change which enabled gettext's macroses by default in: https://github.com/sabotage-linux/gettext-tiny/commit/58187329ad9f00eb8c39379e7ee0b608dd14bab8 it leads libglib2 to fail with format_arg issues. So fix it by disabling these macroses and use rather external functions which requires linking. Signed-off-by: Vadim Kochan --- I dont feel like this is a good solution actually. I need to clearly understand why just using gettext's macrosses does not work for libglib2. But anyway I am sending this patch to show the possible solution. package/Makefile.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index dc818a2c18..c719d39235 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -159,6 +159,9 @@ TARGET_HARDENED += -D_FORTIFY_SOURCE=2 endif TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +TARGET_CPPFLAGS += -DLIBINTL_NO_MACROS=1 +endif TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) $(TARGET_HARDENED) TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) @@ -220,6 +223,9 @@ UNZIP := $(shell which unzip || type -p unzip) -q APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) HOST_CPPFLAGS = -I$(HOST_DIR)/include +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) +HOST_CPPFLAGS += -DLIBINTL_NO_MACROS=1 +endif HOST_CFLAGS ?= -O2 HOST_CFLAGS += $(HOST_CPPFLAGS) HOST_CXXFLAGS += $(HOST_CFLAGS)