From patchwork Thu Dec 13 21:04:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1013158 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.133; helo=hemlock.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="YPQmYN5X"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43G5mQ6wMhz9sB5 for ; Fri, 14 Dec 2018 08:05:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6C0E88629E; Thu, 13 Dec 2018 21:05:08 +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 MLeZq3ZT8ZuU; Thu, 13 Dec 2018 21:05:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EA43086301; Thu, 13 Dec 2018 21:05:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 860571BF368 for ; Thu, 13 Dec 2018 21:05:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 824B180E9F for ; Thu, 13 Dec 2018 21:05:02 +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 8zNQL39knRrx for ; Thu, 13 Dec 2018 21:05:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BD3EA8111A for ; Thu, 13 Dec 2018 21:05:01 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id u4so2446070wrp.3 for ; Thu, 13 Dec 2018 13:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mvGuik3qrwdbinwyImcnGnnIV/0L/J0zLgDoPhcYF/8=; b=YPQmYN5XEV843PhBCvbpTrYGRE5qmNwfmGc5Hrx8DAnmIaWfnx/u9rDAv//MkWqTgQ NeXyWj3DlVo7X6y1HFelgHK3RS8IdlfPWBshdYnDjMtBpDwwsd1Gut/6G22jYUEiN44P zusRHRebJM/pcYZGL3iuXHN1DltRwNMosZGR/WfiX3MdUpyxhtORmhOTKRy4yTB28Ib9 yvMxr827rwDmatNnQ1wvCWV2368nghKorngEqbyy3u3reEbeHiNo4LTOa4TcGJB4+f4b fCHsL8jmRCyyX/PaOH0+ShKPADXS68h/6bdye7iM/T/gg8ojODNbhtxFfKZGAGX+CHzQ U4fA== 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=mvGuik3qrwdbinwyImcnGnnIV/0L/J0zLgDoPhcYF/8=; b=BOL31s0/94Q8P9QP+L+Jgo13r165L8ujXIGmptqxDYeCetFcktbCNREoXRDKiLS+NL fuizNJM+Afy9an61315GiSGwQ1/oBkj+KLqbVS9OITYqBj0Ioziey29I20Is8qwXZs86 cEdKZh71qevWRleWTXkCqbwNHyjxLKOdL53Qox4SkmxdmVEjikXbdTw4iSAguGVAWjHI JUpqMqoH8Q0FsUwPds/bFy20Wmjmu/h/eEWAu/49gRUhlTrHCpnwydAWevm4gDAAEks4 YPSdaJpwHnywcHJHfItZuhDLbU/+RC3B+xlR9kVjcUD9/ETbPreG3J0tMaCGFS2qVxkc theA== X-Gm-Message-State: AA+aEWYebyCOUNqh94u2AwGY7HjAgbX2YHzZEwVqzphROyU7GaPBvuYX FtLjHOpVR+Y9yCBMPmGuCTOrKP0+ X-Google-Smtp-Source: AFSGD/Uv1VJ6MiUYM/I+W7oFrTfgD3zfvw44G5RzWG04lm33gDUzPf71Vxk09kpX3Z3PORnE5bDYWA== X-Received: by 2002:adf:fb0d:: with SMTP id c13mr303728wrr.285.1544735099860; Thu, 13 Dec 2018 13:04:59 -0800 (PST) Received: from localhost.localdomain ([80.12.33.74]) by smtp.gmail.com with ESMTPSA id v19sm5097172wrd.46.2018.12.13.13.04.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 13:04:59 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 13 Dec 2018 22:04:50 +0100 Message-Id: <20181213210450.29474-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] xapp_xload: fix build with pkgconf 1.5.3 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: Bernd Kuhls , Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target. xapp_xload uses the appdefaultdir variable from xt.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location. Until a better solution is found in pkgconf, pass the appdefaultdir to use explicitly instead of relying on xt.pc. Fixes: - http://autobuild.buildroot.org/results/722c1bdfb3f38a13be7a40793a8df4f0324885f4 Signed-off-by: Fabrice Fontaine --- package/x11r7/xapp_xload/xapp_xload.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk index b44a51b5fd..605359bab6 100644 --- a/package/x11r7/xapp_xload/xapp_xload.mk +++ b/package/x11r7/xapp_xload/xapp_xload.mk @@ -10,6 +10,7 @@ XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLOAD_LICENSE = MIT XAPP_XLOAD_LICENSE_FILES = COPYING XAPP_XLOAD_DEPENDENCIES = xlib_libXaw +XAPP_XLOAD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) # musl doesn't have rwhod.h, but xload can replace it with stubs