From patchwork Sun Aug 4 00:14:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1141622 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="fmqxJ705"; 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 461LxZ11zjz9sDB for ; Sun, 4 Aug 2019 10:14:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0306F86837; Sun, 4 Aug 2019 00:14:40 +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 GICyP0YmdIuO; Sun, 4 Aug 2019 00:14:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B05468686A; Sun, 4 Aug 2019 00:14:38 +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 4E9A91BF964 for ; Sun, 4 Aug 2019 00:14:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B9258522B for ; Sun, 4 Aug 2019 00:14:36 +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 4YULmQCeRlIv for ; Sun, 4 Aug 2019 00:14:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 114048521D for ; Sun, 4 Aug 2019 00:14:35 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id j6so40364949ioa.5 for ; Sat, 03 Aug 2019 17:14:35 -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:mime-version :content-transfer-encoding; bh=iCTBnbaD8lPyXUbim6hDr6j7Vhyxho2WI9nAwNSinLY=; b=fmqxJ705eCo2n7uJ7LOaMAodFZTw5lF1zP2y8dlaRzRq0SuSMK78wT19YM43YwKxJ7 p9R8TtSt3LSErZ+vwKxXyFChAoof9RjOdLl81FPuEDe+unixR6HrVYBASYbEDDwuVN6T /41xuOljEAEy5AJdKd6rP2TrPvmYuoCtP0+TlRKArs3tNwwkY89P7DKmzB6MY3B+Ko8r L2y1vmxDgubcX7CHLU1ChMrJc3yOKxJ12FRjBjCmeLxH7jr8wTq1RJAbfWBaKrXZnUst jwi0p8Fmfq94OXfod9keYSAd0z5hAGNcm0XmHBQ0DSj7O4aJAMzokSGDT5ZXxUigS08k I9jQ== 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:mime-version :content-transfer-encoding; bh=iCTBnbaD8lPyXUbim6hDr6j7Vhyxho2WI9nAwNSinLY=; b=FoCB2ZEGjtahAXyNyAsp768xwytN/eBNAxNt2Zap2bU2p/MGIwqsvgKtHujx0oRSp0 cgnHKou6YN4IlIx1vQ7jfaR3FC9r+LTORI5IrwUyRLLebOWmyX8lyHswE0MKbI+qUeqV tGhOXri5e56VCVtyrLbHphhTNb9mV2CuF6IDUxiu3BlM5Zk1KIJUwxOJRDiq2uzbWscd jZnDZsV/arsrI+LQZrvjzvsT655kd9HTkpSQ5JmnTXow5WVXedEtcpyLnP/SE2XMU/9d jI58ebdsO34F34CQiDwX9VPkthgtWvxNovFz5uVAhnJm0VirUD/kzf4HoNgNY+XB5Znx 7+0Q== X-Gm-Message-State: APjAAAUdMOvnw98KegkGqmVYHIpRQ+F3WuHhInmYIN+QpC2nn3KRN56n /hp5ivelgflOYV9BmhHhGv4vzuL1 X-Google-Smtp-Source: APXvYqyutEkzHJ7KCz6jqVTteQ/CqAxhDtIirBl7A571TdS4IEMaRe4+uCC8J+YfnYDl6kiHl3wvSg== X-Received: by 2002:a5d:87da:: with SMTP id q26mr10671843ios.193.1564877673936; Sat, 03 Aug 2019 17:14:33 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p3sm122543923iom.7.2019.08.03.17.14.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 03 Aug 2019 17:14:33 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 3 Aug 2019 20:14:25 -0400 Message-Id: <20190804001429.51451-1-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v13 1/5] package/libiberty: new package 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: "Yann E. MORIN" , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Some packages, like prelink-cross, will want to use libiberty but do not bundle their own instance (which is good!). However, libiberty is made for being bundled in packages: all GNU packages that use libiberty (gcc, binutils, gdb et al...) all have their own bundled variant. This means that there is no official upstream for libiberty; the closest being as part of the combined binutils-gdb tree. So we introduce a new host-only package, that installs just libiberty from a binutils released tarball. Again, as libiberty is usually bundled in packages, it usually only install a static version. Furthermore, it does not obey to the usual --enable-shared and --disable-static flags; it only ever builds a static version. Furthermore, this library is not built with -fPIC, but some packages may pick it to build shared objects. This is the case for host-gdb, for example, which accidentally picks that library instead of its internal one. So, rather than fix the various gdb versions and variants we can use, we ensure that the libiberty we install is usable in shared objects, and we ensure it is always built before host-gdb. Signed-off-by: "Yann E. MORIN" Signed-off-by: Adam Duskett Acked-by: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v11: - Add this patch to the series DEVELOPERS | 1 + package/libiberty/libiberty.hash | 2 ++ package/libiberty/libiberty.mk | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 package/libiberty/libiberty.hash create mode 100644 package/libiberty/libiberty.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8a83f748d1..e9da0c7f50 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2362,6 +2362,7 @@ F: package/keyutils/ F: package/libbsd/ F: package/libedit/ F: package/libgsm/ +F: package/libiberty/ F: package/libinput/ F: package/libiscsi/ F: package/libpri/ diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash new file mode 100644 index 0000000000..270f38dfa7 --- /dev/null +++ b/package/libiberty/libiberty.hash @@ -0,0 +1,2 @@ +# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum +sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk new file mode 100644 index 0000000000..17976fdd4f --- /dev/null +++ b/package/libiberty/libiberty.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libiberty +# +################################################################################ + +LIBIBERTY_VERSION = 2.32 +LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz +LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils +LIBIBERTY_DL_SUBDIR = binutils +LIBIBERTY_SUBDIR = libiberty + +# We explicitly disable multilib, as we do in binutils. +# By default, libiberty installs nothing, so we must force it. +HOST_LIBIBERTY_CONF_OPTS = \ + --disable-multilib \ + --enable-install-libiberty + +# Some packages (e.g. host-gdb) will pick this library and build shared +# objects with it. But libiberty does not honour the --enable-shared and +# --disable-static flags; it only ever builds a static library no matter +# what. So we must force -fPIC in build flags. +HOST_LIBIBERTY_CONF_ENV = \ + CFLAGS="$(HOST_CFLAGS) -fPIC" \ + LDFLAGS="$(HOST_LDFLAGS) -fPIC" + +$(eval $(host-autotools-package)) From patchwork Sun Aug 4 00:14:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1141623 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="dm1QDikc"; 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 461Lxg490xz9s00 for ; Sun, 4 Aug 2019 10:14:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9654687E5E; Sun, 4 Aug 2019 00:14:41 +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 VK9ako9be608; Sun, 4 Aug 2019 00:14:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DA3A187E59; Sun, 4 Aug 2019 00:14:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 30FAA1BF964 for ; Sun, 4 Aug 2019 00:14:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2E63C203D7 for ; Sun, 4 Aug 2019 00:14:37 +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 W8CjByuDHoXs for ; Sun, 4 Aug 2019 00:14:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by silver.osuosl.org (Postfix) with ESMTPS id 7A4BA203D0 for ; Sun, 4 Aug 2019 00:14:36 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id z3so19041989iog.0 for ; Sat, 03 Aug 2019 17:14:36 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=WrGdlCTmzZJtnyM94cJJ4+V6iizNMu0r3IUi6MLaEtQ=; b=dm1QDikcQ76krPw3KRTL7WA2Rji8Vnj/uoq7/aks+QTVuW3BUnxZDB6hTtNbY7t7nE Nnf+c1Y1gMZNmaCqCXo6mTmzpVIbxO5LgcIkYX/h/CSk0tn/wvg+z7l/PeBr2oIMR2aB I/7PJ4MtUcjoYmrsYKwf15UTFRSl1lofuH8F7KsCRmjsuFjXPHtxHURqndzZClTvxQeG LANDifBG1uox8SbF6pA3Pcy/SHpeVtvKDoiKu3nyNchf7WBgYZeXNs16JFA36Ek2THGD e+5Mwyp0IYIsyeayee2JlvimnyCIOYG6IKhuOj30q38O1NE9Zqzf00WKOADbeD3yJKm+ BQlg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WrGdlCTmzZJtnyM94cJJ4+V6iizNMu0r3IUi6MLaEtQ=; b=Hb3yfVgptq6rsbeSBglxF3pdoUKYBhorsTxSwsJRgRMcCL1K5hp46/+Y9IxNrHc0l1 7+OeUt5nmP09GmD0SbVIH5LXUYt9x9lFVFXG89vfxDY+CUoyzZo8VI3r5esOFMjZjt0b GsiBFSwIOgjTnWgFqNFOFfnYPUSN2qPVVgn93pHe+9J+w4DkkhkvxJXBjUwFfTKQqNms M2fPv/uTw8LRYu0D4apzl3hu2nQUvVMm+gmhkojxLJ3Uz6UHo0J92XX+cVn7xQZcJ8ma lZYT5JlcbptjOaR6854NDZEImfhsjR/YAVuSG/ZcuP3hway3ZnOLvomhWbHiIiYEf65A A86A== X-Gm-Message-State: APjAAAVagTvZdeKZh+HRraMKaj7M3VNEo2G2t55onSedqICx9jh240yW PLdDEg8vDMqbckEQAvcHuKm110k0 X-Google-Smtp-Source: APXvYqwTNmouyLDHi/YMUuC/WxJlePp0LyFPnE0rnI/AVYpdajf/a9Qp2LPaUXZJbxuXjCTiaz5/Uw== X-Received: by 2002:a5d:9613:: with SMTP id w19mr945025iol.140.1564877675536; Sat, 03 Aug 2019 17:14:35 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p3sm122543923iom.7.2019.08.03.17.14.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 03 Aug 2019 17:14:35 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 3 Aug 2019 20:14:26 -0400 Message-Id: <20190804001429.51451-2-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190804001429.51451-1-aduskett@gmail.com> References: <20190804001429.51451-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v13 2/5] package/prelink-cross: new package 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: "Yann E. MORIN" , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Prelink-cross emulates a runtime linker for a given sysroot. This is necessary to allow gobject-introspection to build its typelib files during cross-compiling. We're using a sha1 on the cross_prelink branch, as we need the RTLD-enabled variant of prelink-cross. Signed-off-by: "Yann E. MORIN" Signed-off-by: Adam Duskett --- Changes v11 -> v12: - Change version to a853a5d715d84eec93aa68e8f2df26b7d860f5b2 as the commit id b10e14218646d8b74773b82b0f8b395bce698fa2 no longer exists. Changes v10 -> v11: - adopted by Yann - switch to a https git server - drop the Config.in.host entry - fix typo in commit log Changes v9 -> v10: - None Changes v8 -> v9: - Add the package to the DEVELOPERS file under my name. - Bump version to a853a5d715d84eec93aa68e8f2df26b7d860f5b2 - Add host-elfutils as a dependency. Changes v7 -> v8: - None Changes v1 -> v7: - Add patch to series. DEVELOPERS | 1 + package/prelink-cross/prelink-cross.hash | 3 +++ package/prelink-cross/prelink-cross.mk | 15 +++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 package/prelink-cross/prelink-cross.hash create mode 100644 package/prelink-cross/prelink-cross.mk diff --git a/DEVELOPERS b/DEVELOPERS index e9da0c7f50..407f3f1b1d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -56,6 +56,7 @@ F: package/openjdk/ F: package/openjdk-bin/ F: package/php/ F: package/policycoreutils/ +F: package/prelink-cross/ F: package/python3/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash new file mode 100644 index 0000000000..3ac33ac3d0 --- /dev/null +++ b/package/prelink-cross/prelink-cross.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk new file mode 100644 index 0000000000..d97141bab4 --- /dev/null +++ b/package/prelink-cross/prelink-cross.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# host-prelink-cross +# +################################################################################ + +HOST_PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2 +HOST_PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross +HOST_PRELINK_CROSS_SITE_METHOD = git +HOST_PRELINK_CROSS_LICENSE = GPL-2.0 +HOST_PRELINK_CROSS_LICENSE_FILES = COPYING +HOST_PRELINK_CROSS_AUTORECONF = YES +HOST_PRELINK_CROSS_DEPENDENCIES = host-elfutils host-libiberty + +$(eval $(host-autotools-package)) From patchwork Sun Aug 4 00:14:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1141624 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="INF3xWlO"; 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 461Lxg595nz9sDB for ; Sun, 4 Aug 2019 10:14:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 28E3487E5C; Sun, 4 Aug 2019 00:14:44 +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 BBZozbh5n5BC; Sun, 4 Aug 2019 00:14:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 77BC687E60; Sun, 4 Aug 2019 00:14:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3F7EC1BF964 for ; Sun, 4 Aug 2019 00:14:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C7113869D3 for ; Sun, 4 Aug 2019 00:14:40 +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 Kt7kWW2O8LPq for ; Sun, 4 Aug 2019 00:14:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 80EC586833 for ; Sun, 4 Aug 2019 00:14:37 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id g20so160197115ioc.12 for ; Sat, 03 Aug 2019 17:14:37 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=RL0DTOJ8gN8ZsUAjd/skMvO1tnpd10KGJLpTPo2fEPk=; b=INF3xWlOLMOPdXL/r4yk1m2t594hr0LxEsgae4vblwGCDEWMeTsCwkSDwsJqAiyMAI WlN/zBTumnqWgZhoG2jGoxlsx1wccacUQcNKMDP1BbrGN399Sl0+/GUL97Isj1OAzcwF zYY0K6MxRg/ZQ84pZ4YCPkqoFrrgCkV8pyALvRvia25WA/CjWKXGCMoH+MPZnier41xk TI+IZgMNJMg6aK9ZTTm5qwn3HA1Mb6upg9hTHEw98WF0lBOkvFn/FF7yXPp2dP0E5VzC YMZJLWqpjfvkOGQadnsxC+AbJDHLURD/eFmFNMJG1KpSlIgq8eYfQwCbj3kY12dzZX1f uf+Q== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=RL0DTOJ8gN8ZsUAjd/skMvO1tnpd10KGJLpTPo2fEPk=; b=bn/VuHIezH1N57aD0CjFzjPKYCbZPgAQDgLQf3+9H2jxOWZx3Hl78/Yo4Do2Gct/tb kWJimxE7ax0i5ulZOm3P/rvTjarGQ80mjlZz6lnpLApKa9ZTNHeTVgQAU527j5HgI3HB q6rhcPFzCo2x+empA0/95zi7sd+LGAgfxkVISS7VRU0kZuMRQ/50ZhlkWEll+mUL2jPq pQe1uWMWI+K/xFg2SmAwzpTIQSONNePfpLjqqSMQf5Jl3vXxVjqd4Rn+/V4T4vDOpk1u 8B7xoLbIK779ZdiBTE1ea/z3nzcC/D0b82b8HLsUspkfDvXq7vgUW7qSOFQn9ChiK3xQ vvNQ== X-Gm-Message-State: APjAAAWJU/6FhuUlAQ+Iu8jfIjcLgEQbAf0qMGR2JCrxaQMI3/9CyrB6 qWSi6oJg8aotkSA9OYbGsclwCqe5 X-Google-Smtp-Source: APXvYqwMhb4A6zJbBRwFGhCaHgaoqjX3m8e7STDFB8m3u7DUIat6qFirkERu+0OfNRcxxCsmRKM3Aw== X-Received: by 2002:a5d:91d7:: with SMTP id k23mr7383719ior.163.1564877676536; Sat, 03 Aug 2019 17:14:36 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p3sm122543923iom.7.2019.08.03.17.14.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 03 Aug 2019 17:14:36 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 3 Aug 2019 20:14:27 -0400 Message-Id: <20190804001429.51451-3-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190804001429.51451-1-aduskett@gmail.com> References: <20190804001429.51451-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v13 3/5] package/gdb: depend on libiberty 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: "Yann E. MORIN" , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett If present, GDB may use a system installed libiberty. As such, we must ensure that host-libiberty is installed first. Signed-off-by: "Yann E. MORIN" Signed-off-by: Adam Duskett --- v1 -> v11: - Add this patch to the series package/gdb/gdb.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 46d745a897..39d20be1aa 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -35,7 +35,9 @@ endif # For the host variant, we really want to build with XML support, # which is needed to read XML descriptions of target architectures. We # also need ncurses. -HOST_GDB_DEPENDENCIES = host-expat host-ncurses +# As for libiberty, gdb may use a system-isntalled one if present, so +# we must ensure ours is installed first. +HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true From patchwork Sun Aug 4 00:14:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1141625 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="mMprV0Q3"; 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 461Lxg5GS9z9sMr for ; Sun, 4 Aug 2019 10:14:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 483B1871F4; Sun, 4 Aug 2019 00:14:44 +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 I2VkWMTASTlJ; Sun, 4 Aug 2019 00:14:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C5A7B869D3; Sun, 4 Aug 2019 00:14:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 602491BF964 for ; Sun, 4 Aug 2019 00:14:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5CEE9203D7 for ; Sun, 4 Aug 2019 00:14:39 +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 ODz23Hz7CtZf for ; Sun, 4 Aug 2019 00:14:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) by silver.osuosl.org (Postfix) with ESMTPS id A95BC203D0 for ; Sun, 4 Aug 2019 00:14:38 +0000 (UTC) Received: by mail-io1-f48.google.com with SMTP id k20so6955365ios.10 for ; Sat, 03 Aug 2019 17:14:38 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=3jhk6UTxTo37ktp0NtFI8kF7bp53MCmJ3C4UrdIaJew=; b=mMprV0Q3Xso7FIoDYxVWBqrkH4lsFBv42nCOttRFF83cP+UJP9ZsNxh6HDbSQ9h/Z9 q86aZngXaBEPJfbJmiceB9VhN7qvOx3KpVT0OKLgzVkNQRtw77GHpnv7wn2MG3yvl4ex zscM5kts05lBLlJZMGykWvofjsRwO0okp3Ja+Jh2tnolRFxQPFHKomb/2sKQBNwxdGZ9 gwGlVivhppV3HUOFZYfX2/GhEsGg0crvcHdwayGQUfXq665y+wjxuXzcHX7B0q/JN8IU 72Fe0QNv9x16lmSZ0Uc79l4HGD+Mu8TRGnDeUURkoiur0QeN0SJzKo4r1XQWO9zF7YwI lRFQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3jhk6UTxTo37ktp0NtFI8kF7bp53MCmJ3C4UrdIaJew=; b=RkWPYTNfak0y0kQUCeIF40mS9D6uKyzVa/u/NYxQBzwapHsHB78GI4NjHNBbVuix8K iFCpSQnJ7xT4psuIZtUCvOL0TdmwIC1NCUq8wTztswZVtpmSZqR8hJhwDQg6gHOa4quq 0pzm3O2FoWF41MD/R2mb7uA2DLX445gPq8SooIFKCDYLI5sUIFePO6FvbX8q+K0SOBtF j4OtjWs9d22N9rQcoh1Gc8t/TkKdGWZuJYBuUz9mr39CEOEJ+d/cWRB24xxUbffmx/DM ZNiK9kxSZCZcu2jaBgWlWZz/B4qd63VULguc/Dzf7IOOBz4+j5RijXaSZtShhOnnfMKP /gKQ== X-Gm-Message-State: APjAAAUP7+4xiGL3TNIUzUOeQiHkHXFcYUMQ+B/1+qw2FuBf2HTvZ1k6 d21SfremM2xrGGGD7WCuY61MUIr/ X-Google-Smtp-Source: APXvYqzkD94NWbFdgeDomPTWYQ4WC17DooXJRjYMyIVsibcsJsRm4yrMWMV3HsY21ckR+DHgCC7eKA== X-Received: by 2002:a6b:b9c2:: with SMTP id j185mr911615iof.148.1564877677803; Sat, 03 Aug 2019 17:14:37 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p3sm122543923iom.7.2019.08.03.17.14.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 03 Aug 2019 17:14:37 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 3 Aug 2019 20:14:28 -0400 Message-Id: <20190804001429.51451-4-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190804001429.51451-1-aduskett@gmail.com> References: <20190804001429.51451-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v13 4/5] package/meson: prevent python include path manipulation 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: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett From: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-devtools/meson/meson/ Meson exports a bunch of PKG_CONFIG_ variables which causes a double prefix for the staging python include directory. Signed-off-by: Adam Duskett --- Changes v11 -> v12: - Remove accidental copy and paste in the commit message. Changes v1 -> v11: - Add this patch to the series ...-environment-when-calling-pkg-config.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch diff --git a/package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch b/package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch new file mode 100644 index 0000000000..a72be80bae --- /dev/null +++ b/package/meson/0002-python-module-do-not-manipulate-the-environment-when-calling-pkg-config.patch @@ -0,0 +1,48 @@ +From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 19 Nov 2018 14:24:26 +0100 +Subject: [PATCH] python module: do not manipulate the environment when calling pkg-config + +From: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-devtools/meson/meson/ + +Meson exports a bunch of PKG_CONFIG_ variables which causes a double prefix to +the python include directory. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett + +--- + mesonbuild/modules/python.py | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index 9cfbd6f..3ff687a 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -76,11 +76,6 @@ class PythonDependency(ExternalDependency): + old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') + old_pkg_path = os.environ.get('PKG_CONFIG_PATH') + +- os.environ.pop('PKG_CONFIG_PATH', None) +- +- if pkg_libdir: +- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir +- + try: + self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) + mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) +@@ -89,13 +84,6 @@ class PythonDependency(ExternalDependency): + mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) + mlog.debug(e) + +- if old_pkg_path is not None: +- os.environ['PKG_CONFIG_PATH'] = old_pkg_path +- +- if old_pkg_libdir is not None: +- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir +- else: +- os.environ.pop('PKG_CONFIG_LIBDIR', None) + else: + mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) + From patchwork Sun Aug 4 00:14:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1141626 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="kLP2iKPQ"; 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 461Lxz1ztvz9s00 for ; Sun, 4 Aug 2019 10:15:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 475E8203E4; Sun, 4 Aug 2019 00:14:59 +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 9HRCSwLr42VD; Sun, 4 Aug 2019 00:14:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8EFFA203DD; Sun, 4 Aug 2019 00:14:45 +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 1D5961BF964 for ; Sun, 4 Aug 2019 00:14:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0516A87E8B for ; Sun, 4 Aug 2019 00:14:44 +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 Hm0aCGhwwtfZ for ; Sun, 4 Aug 2019 00:14:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 303CB87E5C for ; Sun, 4 Aug 2019 00:14:41 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id s7so160018965iob.11 for ; Sat, 03 Aug 2019 17:14:41 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y0pb+BSWquAIeBaNya1aGQkn3GvowTsr4YyShUVyh1c=; b=kLP2iKPQvP6Yit3ecSapUp2nWvmosBVdk5D2iNVG8Hgdpig6E8En79QBu7GJGjWWoV l6fQc22eBU8hPa7Wsz5chuLws6F5qnTOQkNO5oKTuJnpLbkhWFSiRqdpeDkIPiiM2I0Q bEyLJYiVJr87MM3pPNcNyTe/ypmhJ1YckaoumidU2Kj6NJf18uOVN/MWSuktbQRr8WgL ap7ZFZSBuuuQgutaoA4Q7mvKybnAwLFU7L4nT/cp/QgNJ+RPUWiAZqrb8ERg3TWjf+y3 BPZ+348yEcJyiqmfJmgBGxBzrQi6fQBTKuY6vQpnUlqg8TN8uf2T/JkyevQ9A/JOeQcm i/GA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y0pb+BSWquAIeBaNya1aGQkn3GvowTsr4YyShUVyh1c=; b=MyzDFCBBkWHP7Qj1iNeiiDwguPjcoR/0bkBsc5I1HaNENJJYZvuPFxsjgUfR/nU1AU 7GtG+nkzr7MnqF491FaYVsCkOA2N7PtvyBUiBoampKfdq9fq3L3ezkKtcpI5lz/VP1XC OuCKw4X91iDL4Qf/rTbQuuwLOVJuggkkvsGi5KH/XFM9geQFlyLBSsgOf/ITYR6SN531 RaTEg2Hyvyw1hWj4AN45c4FPV4Akp+jtd/oWTmHG2zHUP+Ik7fy/HW7+bxLCxqTuDt3q eRWaJ25MPjDkS4+rBpUwsBXdMh/ewo2B8nijj2AzpN1IXPLsZNoP2bsqFB6HqX5UO8Hm 3QGA== X-Gm-Message-State: APjAAAV2jF8oPZRGQ33mwmDHvkfv1jfVQb+5f/ywtBLj7fOBAhhXlZN6 5/w5mduXcrkpvnvlCv3kEbb7FXCF X-Google-Smtp-Source: APXvYqy/3C2y+bycsyeBRLrqAShsL033jaKe34ETplf/kUth37jQi8sVwglf/vMZpdyHL34q60gl6g== X-Received: by 2002:a6b:691d:: with SMTP id e29mr861481ioc.96.1564877679616; Sat, 03 Aug 2019 17:14:39 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id p3sm122543923iom.7.2019.08.03.17.14.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 03 Aug 2019 17:14:39 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Sat, 3 Aug 2019 20:14:29 -0400 Message-Id: <20190804001429.51451-5-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190804001429.51451-1-aduskett@gmail.com> References: <20190804001429.51451-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v13 5/5] package/gobject-introspection: new package 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: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett GObject introspection is a middleware layer between C libraries (using GObject) and language bindings. The C library can be scanned at compile time and generate a metadata file, in addition to the actual native C library. Then at runtime, language bindings can read this metadata and automatically provide bindings to call into the C library. There's an XML format called GIR used by GObject-Introspection. The purpose of it is to provide a standard structure to access the complete available API that a library or other unit of code exports. It is meant to be language agnostic using namespaces to separate core, language or library specific functionality. Cross-compiling gobject-introspection is not an easy task. The main issue is that in the process of creating the XML files, gobject-introspection must first run and scan the binary, which, if the binary is cross-compiled, would not typically be possible from the host system. Because of this limitation, several wrappers are used to call instead first out qemu which will then run the native scanner to create the binaries. There are seven total patches and four different wrapper files needed to successfully cross-compile and run this package, many of them are from open-embedded, but two of them are of my own doing. 1) Revert a previous, incomplete attempt at adding cross-compiling support. 2) Add support for cross compiling with meson. 3) Disable tests when cross-compiling. 4) Add support for the various wrappers. (See patch for details.) 5) Add an option to use a binary wrapper; this patch will force giscanner to use a wrapper executable to run binaries it's producing, instead of attempting to run them from the host. 6) Add an option to use an LDD wrapper, again, useful for cross-compiled environments. 7) Add a --lib-dirs-envar option to pass to giscanner. (See patch for details.) 8) Add rpath-links to ccompiler: when passing the PACKAGE_GIR_EXTRA_LIBS_PATH to the ccompiler.py script, ccompiler.py needs to add -Wl,-rpath-link to the environment for the package to correctly link against the passed on paths. 9) Ignore error return codes from ldd-wrapper because prelink-rtld returns 127 when it can't find a library, which will break subprocess.check_output(). Signed-off-by: Adam Duskett --- Changes v10 -> v11: - reorder config.in entries: arch deps first, then toolchain deps and order packages deps alphabetically (Yann) - drop dependency on threads, wchar, and !static: it's implicit from glibc (Yann) - Bump to version 1.60.2 - Switched to a meson build system as autotools is no longer supported with gobject-introspection 1.60.x. - Removed the following patches that are no longer needed: - 0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch - 0005-user-PYTHON_CONFIG-to-find-includes.patch - 0008-fix-gobject-pc.file.patch - Add the following patches: - 0002-add-cross-compilation-support-to-meson.patch - 0003-meson.build-disable-tests-when-cross-compiling.patch - 0008-ignore-error-return-codes-from-ldd-wrapper.patch Changes v9 -> v10: - Makefile cleanup - Fix license syntax (Thomas) - Add libffi as a mandatory dependency (Thomas) - remove --disalbe-static (Thomas) - add --with-cairo if the cairo package is selected (Thomas) - Change PYTHON_INCLUDES to PYTHON_CONFIG in gobject-introspection.mk (Thomas) - Use | for all sed functions (Thomas) - Remove GOBJECT_INTROSPECTION_WRAPPERS (Thomas) - Add GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES target finalize hook. (Thomas) - Use $(dirname $0) in wrappers instead of $STAGING_DIR (Thomas) - Remove _GIR_EXTRA_LIBS_PATH in pkg-autotools.mk in favor of a seperate patch. (Thomas) Changes v8 -> v9: - Create the $(STAGING_DIR)/usr/lib/gio/modules-dummy directory in the GOBJECT_INTROSPECTION_POST_PATCH_HOOKS to prevent qemu from segfaulting when g-ir-scanner-qemuwrapper is ran. - Remove the $(STAGING_DIR) prefix from gobject-introspection-1.0.pc to prevent pkg-config from appending a second staging_dir to the path of the g-ir-compiler. This prevents packages such a gstreamer1 from trying to call $(STAGING_DIR)/$(STAGING_DIR)/usr/bin/g-ir-compiler, which will break the build. Changes v7 -> v8: - Add "select BR2_PACKAGE_HOST_PRELINK_CROSS" to Config.in Changes v6 -> v7: - Remove the cross-ldd script in favor of the prelink-cross package. - Install the ldd and qemu wrappers in a post patch hook seperate of the other wrappers. - Set --enable-introspection-data in the configure options. Changes v5 -> v6: - Update gobject-introspection to 1.56.1 - Remove upstreamed 0008-add-Float128.patch Changes v4 -> v5: - Added a more detailed commit message (Yann) - Removed $HOST_DIR/bin/qemu-@HOST_QEMU_ARCH@ @HOST_QEMU_CPU_TUNE@ in favor of @QEMU_USER@ (Thanks Yann) Changes v3 -> v4: - Removed RFC tag. - Added 0007-Add-rpath-links-to-ccompiler.patch - Removed config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch as it is not Yocto specific. - Added the _GIR_EXTRA_LIBS_PATH to pkg-autotools.mk. This allows package specific Gir libraries to be passed on to g-ir-scanner-qemuwrapper. - Fixed a typo in g-ir-scanner-qemuwrapper.in. - Remove BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in favor of BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS Changes v2 -> v3: - Removed Linux kernel dependency (baruch) - Changed $(LINUX_VERSION) to $(BR2_TOOLCHAIN_HEADERS_AT_LEAST) (baruch) - Changed @LINUX_VERSION@ in g-ir-scanner-qemuwrapper.in to @TOOLCHAIN_HEADERS_VERSION@ to match the above variable change. - Added BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS_TARGET in Config.in with only BR2_arm selected for now. - Removed BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS in favor of the above change. - Added two new lines in the base Makefile which removes any remaining .gir or .rnc files from the target filing system, as these are not needed or runtime, only compile time. Changes v1 -> v2: - Fixed wrappers - Added 0007-giscanner-add-a-lib-dirs-envvar-option.patch - Added 0008-add-Float128.patch DEVELOPERS | 1 + package/Config.in | 1 + ...lete-upstream-attempt-at-cross-compi.patch | 33 ++++ ...d-cross-compilation-support-to-meson.patch | 163 ++++++++++++++++++ ...d-disable-tests-when-cross-compiling.patch | 27 +++ ...canner-add-use-binary-wrapper-option.patch | 52 ++++++ ...scanner-add-a-use-ldd-wrapper-option.patch | 48 ++++++ ...scanner-add-a-lib-dirs-envvar-option.patch | 73 ++++++++ .../0007-Add-rpath-links-to-ccompiler.patch | 29 ++++ ...-error-return-codes-from-ldd-wrapper.patch | 28 +++ package/gobject-introspection/Config.in | 26 +++ .../gobject-introspection/g-ir-compiler.in | 2 + .../g-ir-scanner-lddwrapper.in | 2 + .../g-ir-scanner-qemuwrapper.in | 17 ++ package/gobject-introspection/g-ir-scanner.in | 7 + .../gobject-introspection.hash | 4 + .../gobject-introspection.mk | 103 +++++++++++ 17 files changed, 616 insertions(+) create mode 100644 package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch create mode 100644 package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch create mode 100644 package/gobject-introspection/0003-meson.build-disable-tests-when-cross-compiling.patch create mode 100644 package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch create mode 100644 package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch create mode 100644 package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch create mode 100644 package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch create mode 100644 package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch create mode 100644 package/gobject-introspection/Config.in create mode 100644 package/gobject-introspection/g-ir-compiler.in create mode 100644 package/gobject-introspection/g-ir-scanner-lddwrapper.in create mode 100644 package/gobject-introspection/g-ir-scanner-qemuwrapper.in create mode 100644 package/gobject-introspection/g-ir-scanner.in create mode 100644 package/gobject-introspection/gobject-introspection.hash create mode 100644 package/gobject-introspection/gobject-introspection.mk diff --git a/DEVELOPERS b/DEVELOPERS index 407f3f1b1d..f5c52b47e3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -34,6 +34,7 @@ F: package/audit/ F: package/busybox/ F: package/checkpolicy/ F: package/cppdb/ +F: package/gobject-introspection/ F: package/gstreamer1/gstreamer1/ F: package/gstreamer1/gstreamer1-mm/ F: package/gstreamer1/gst1-plugins-bad/ diff --git a/package/Config.in b/package/Config.in index f84effff01..8696864f47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1690,6 +1690,7 @@ menu "Other" source "package/glibmm/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" + source "package/gobject-introspection/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/jemalloc/Config.in" diff --git a/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch new file mode 100644 index 0000000000..1e8bd3518a --- /dev/null +++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch @@ -0,0 +1,33 @@ +From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 23 Mar 2016 17:07:28 +0200 +Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile support + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + common.mk | 4 ---- + giscanner/gdumpparser.py | 6 ------ + 2 files changed, 10 deletions(-) + +diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py +index 1134f33..9bdc2bc 100644 +--- a/giscanner/gdumpparser.py ++++ b/giscanner/gdumpparser.py +@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection.""" + out_path = os.path.join(self._binary.tmpdir, 'dump.xml') + + args = [] +- +- # Prepend the launcher command and arguments, if defined +- launcher = os.environ.get('GI_CROSS_LAUNCHER') +- if launcher: +- args.extend(launcher.split()) +- + args.extend(self._binary.args) + args.append('--introspect-dump=%s,%s' % (in_path, out_path)) + +-- +2.7.0 + diff --git a/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch new file mode 100644 index 0000000000..5e3ac59dd9 --- /dev/null +++ b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch @@ -0,0 +1,163 @@ +From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 15 Nov 2018 15:10:05 +0100 +Subject: [PATCH] add cross-compilation support to meson + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + gir/meson.build | 62 ++++++++++++++++++++++++++++++++++------------- + meson.build | 4 ++- + meson_options.txt | 20 +++++++++++++++ + 3 files changed, 68 insertions(+), 18 deletions(-) + +diff --git a/gir/meson.build b/gir/meson.build +index 85ae575..327c134 100644 +--- a/gir/meson.build ++++ b/gir/meson.build +@@ -36,16 +36,29 @@ gir_files = [ + typelibdir = join_paths(get_option('libdir'), 'girepository-1.0') + install_data(gir_files, install_dir: girdir) + +-scanner_command = [ +- python, +- girscanner, +- '--output=@OUTPUT@', +- '--no-libtool', +- '--quiet', +- '--reparse-validate', +- '--add-include-path', join_paths(meson.current_build_dir()), +- '--add-include-path', join_paths(meson.current_source_dir()), +-] ++if get_option('enable-host-gi') ++ scanner_command = [ ++ 'g-ir-scanner', ++ '--output=@OUTPUT@', ++ '--no-libtool', ++ '--quiet', ++ '--reparse-validate', ++ '--add-include-path', join_paths(meson.current_build_dir()), ++ '--add-include-path', join_paths(meson.current_source_dir()), ++ ] ++else ++ scanner_command = [ ++ python, ++ girscanner, ++ '--output=@OUTPUT@', ++ '--no-libtool', ++ '--quiet', ++ '--reparse-validate', ++ '--add-include-path', join_paths(meson.current_build_dir()), ++ '--add-include-path', join_paths(meson.current_source_dir()), ++ ] ++endif ++ + + dep_type = glib_dep.type_name() + if dep_type == 'internal' +@@ -58,6 +71,12 @@ if dep_type == 'internal' + '--extra-library=glib-2.0', '--extra-library=gobject-2.0'] + endif + ++if get_option('enable-gi-cross-wrapper') != '' ++ scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')] ++endif ++if get_option('enable-gi-ldd-wrapper') != '' ++ scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')] ++endif + # Take a glob and print to newlines + globber = ''' + from glob import glob +@@ -84,8 +103,8 @@ glib_command = scanner_command + [ + + if dep_type == 'pkgconfig' + glib_command += ['--external-library', '--pkg=glib-2.0'] +- glib_libdir = glib_dep.get_pkgconfig_variable('libdir') +- glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') ++ glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir') ++ glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0') + glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include') + glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h') + glib_files += join_paths(glib_libincdir, 'glibconfig.h') +@@ -339,7 +358,7 @@ endforeach + if giounix_dep.found() + if dep_type == 'pkgconfig' + gio_command += ['--pkg=gio-unix-2.0'] +- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') ++ giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0') + # Get the installed gio-unix header list + ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h'))) + if ret.returncode() != 0 +@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository', + ) + + typelibs = [] ++if get_option('enable-gi-cross-wrapper') != '' ++ gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@', ++ '--includedir', meson.current_build_dir(), ++ '--includedir', meson.current_source_dir(), ++ ] ++else ++ gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@', ++ '--includedir', meson.current_build_dir(), ++ '--includedir', meson.current_source_dir(), ++ ] ++endif ++ + foreach gir : gir_files + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', + depends: [gobject_gir, ], +- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@', +- '--includedir', meson.current_build_dir(), +- '--includedir', meson.current_source_dir(), +- ], ++ command: gircompiler_command, + install: true, + install_dir: typelibdir, + ) +diff --git a/meson.build b/meson.build +index 95bbd2b..f7baefd 100644 +--- a/meson.build ++++ b/meson.build +@@ -163,7 +163,9 @@ endif + subdir('girepository') + subdir('tools') + subdir('giscanner') +-subdir('gir') ++if get_option('enable-introspection-data') == true ++ subdir('gir') ++endif + subdir('examples') + subdir('docs') + subdir('tests') +diff --git a/meson_options.txt b/meson_options.txt +index 445a68a..a325511 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3', + option('gir_dir_prefix', type: 'string', + description: 'Intermediate prefix for gir installation under ${prefix}' + ) ++ ++option('enable-host-gi', type: 'boolean', value : false, ++ description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)' ++) ++ ++option('enable-gi-cross-wrapper', type: 'string', ++ description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)' ++) ++ ++option('enable-gi-ldd-wrapper', type: 'string', ++ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)' ++) ++ ++option('enable-introspection-data', type: 'boolean', value : true, ++ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools' ++) ++ ++option('pkgconfig-sysroot-path', type: 'string', ++ description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)' ++) diff --git a/package/gobject-introspection/0003-meson.build-disable-tests-when-cross-compiling.patch b/package/gobject-introspection/0003-meson.build-disable-tests-when-cross-compiling.patch new file mode 100644 index 0000000000..10d592272a --- /dev/null +++ b/package/gobject-introspection/0003-meson.build-disable-tests-when-cross-compiling.patch @@ -0,0 +1,27 @@ +From 2c384187cc22113c0c9b1cd233948118f7c085ef Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 25 Mar 2019 13:28:48 +0100 +Subject: [PATCH] meson.build: disable tests when cross-compiling + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/64] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2544ff3..4c16fe5 100644 +--- a/meson.build ++++ b/meson.build +@@ -168,7 +168,9 @@ if get_option('enable-introspection-data') == true + endif + subdir('examples') + subdir('docs') +-subdir('tests') ++if not meson.is_cross_build() ++ subdir('tests') ++endif + + install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0')) + install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) diff --git a/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch new file mode 100644 index 0000000000..cffc2d954d --- /dev/null +++ b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch @@ -0,0 +1,52 @@ +From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 19 Oct 2015 18:26:40 +0300 +Subject: [PATCH] giscanner: add --use-binary-wrapper option + +With this option, giscanner will use a wrapper executable to run +binaries it's producing, instead of running them directly. This +is useful when binaries are cross-compiled and cannot be run directly, +but they can be run using for example QEMU emulation. + +Upstream-Status: Pending [review on oe-core list] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + giscanner/scannermain.py | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 633496f..d684cd0 100755 +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -120,6 +120,9 @@ def _get_option_parser(): + parser.add_option("", "--program", + action="store", dest="program", default=None, + help="program to execute") ++ parser.add_option("", "--use-binary-wrapper", ++ action="store", dest="wrapper", default=None, ++ help="wrapper to use for running programs (useful when cross-compiling)") + parser.add_option("", "--program-arg", + action="append", dest="program_args", default=[], + help="extra arguments to program") +@@ -417,6 +420,17 @@ def create_binary(transformer, options, args): + gdump_parser.get_error_quark_functions()) + + shlibs = resolve_shlibs(options, binary, options.libraries) ++ if options.wrapper: ++ # The wrapper needs the binary itself, not the libtool wrapper script, ++ # so we check if libtool has sneaked the binary into .libs subdirectory ++ # and adjust the path accordingly ++ import os.path ++ dir_name, binary_name = os.path.split(binary.args[0]) ++ libtool_binary = os.path.join(dir_name, '.libs', binary_name) ++ if os.path.exists(libtool_binary): ++ binary.args[0] = libtool_binary ++ # Then prepend the wrapper to the command line to execute ++ binary.args = [options.wrapper] + binary.args + gdump_parser.set_introspection_binary(binary) + gdump_parser.parse() + return shlibs +-- +2.7.0 + diff --git a/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch new file mode 100644 index 0000000000..386c1c34b0 --- /dev/null +++ b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch @@ -0,0 +1,48 @@ +From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 30 Oct 2015 16:28:46 +0200 +Subject: [PATCH] giscanner: add a --use-ldd-wrapper option + +This is useful in cross-compile environments where system's ldd +command does not work on binaries built for a different architecture + +Upstream-Status: Pending [review in oe-core] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + giscanner/scannermain.py | 3 +++ + giscanner/shlibs.py | 4 +++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index d684cd0..1b3b369 100755 +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -123,6 +123,9 @@ def _get_option_parser(): + parser.add_option("", "--use-binary-wrapper", + action="store", dest="wrapper", default=None, + help="wrapper to use for running programs (useful when cross-compiling)") ++ parser.add_option("", "--use-ldd-wrapper", ++ action="store", dest="ldd_wrapper", default=None, ++ help="wrapper to use instead of ldd (useful when cross-compiling)") + parser.add_option("", "--program-arg", + action="append", dest="program_args", default=[], + help="extra arguments to program") +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index c93d20c..c5b5942 100644 +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -97,7 +97,9 @@ def _resolve_non_libtool(options, binary, libraries): + args.extend(libtool) + args.append('--mode=execute') + platform_system = platform.system() +- if platform_system == 'Darwin': ++ if options.ldd_wrapper: ++ args.extend([options.ldd_wrapper, binary.args[0]]) ++ elif platform_system == 'Darwin': + args.extend(['otool', '-L', binary.args[0]]) + else: + args.extend(['ldd', binary.args[0]]) +-- +2.7.0 + diff --git a/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch new file mode 100644 index 0000000000..06f5635610 --- /dev/null +++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch @@ -0,0 +1,73 @@ +From 3a9b3d8179b7eb9d2cc93da31578945bc03a45c3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 27 Apr 2018 12:56:15 -0400 +Subject: [PATCH] giscanner: add a --lib-dirs-envvar option + +By default LD_LIBRARY_PATH is set to the list of target library paths; +this breaks down in cross-compilation environment, as we need to run a +native emulation wrapper rather than the target binary itself. This patch +allows exporting those paths to a different environment variable +which can be picked up and used by the wrapper. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + giscanner/ccompiler.py | 4 ++-- + giscanner/dumper.py | 3 ++- + giscanner/scannermain.py | 3 +++ + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index d10327c..6cf25d5 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -174,7 +174,7 @@ class CCompiler(object): + + self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations" + +- def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths): ++ def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths, lib_dirs_envvar): + # An "internal" link is where the library to be introspected + # is being built in the current directory. + +@@ -184,7 +184,7 @@ class CCompiler(object): + if os.name == 'nt': + runtime_path_envvar = ['LIB', 'PATH'] + else: +- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] ++ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar] + # Search the current directory first + # (This flag is not supported nor needed for Visual C++) + args.append('-L.') +diff --git a/giscanner/dumper.py b/giscanner/dumper.py +index 3c7220b..0abd565 100644 +--- a/giscanner/dumper.py ++++ b/giscanner/dumper.py +@@ -244,7 +244,8 @@ class DumpCompiler(object): + libtool, + self._options.libraries, + self._options.extra_libraries, +- self._options.library_paths) ++ self._options.library_paths, ++ self._options.lib_dirs_envvar) + args.extend(pkg_config_libs) + + else: +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index d262785..51c9570 100755 +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -126,6 +126,9 @@ def _get_option_parser(): + parser.add_option("", "--use-ldd-wrapper", + action="store", dest="ldd_wrapper", default=None, + help="wrapper to use instead of ldd (useful when cross-compiling)") ++ parser.add_option("", "--lib-dirs-envvar", ++ action="store", dest="lib_dirs_envvar", default=None, ++ help="environment variable to write a list of library directories to (for running the transient binary), instead of standard LD_LIBRARY_PATH") + parser.add_option("", "--program-arg", + action="append", dest="program_args", default=[], + help="extra arguments to program") +-- +2.14.3 + diff --git a/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch new file mode 100644 index 0000000000..08835d3ecc --- /dev/null +++ b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch @@ -0,0 +1,29 @@ +From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 14 Mar 2018 12:07:10 -0400 +Subject: [PATCH] Add rpath links to ccompiler + +This patch allows gobject-introspection to process extra paths passed to the +compiler via the GIR_EXTRA_LIBS_PATH variable. + +Signed-off-by: Adam Duskett +--- + giscanner/ccompiler.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py +index a8bd5b1..51bb9bc 100644 +--- a/giscanner/ccompiler.py ++++ b/giscanner/ccompiler.py +@@ -229,6 +229,8 @@ class CCompiler(object): + + for envvar in runtime_path_envvar: + if envvar in os.environ: ++ for envvar_path in os.environ[envvar].split(':'): ++ args.append("-Wl,-rpath-link," + envvar_path) + os.environ[envvar] = \ + os.pathsep.join(runtime_paths + [os.environ[envvar]]) + else: +-- +2.14.3 + diff --git a/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch new file mode 100644 index 0000000000..568758d332 --- /dev/null +++ b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch @@ -0,0 +1,28 @@ +From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 5 Sep 2018 16:46:52 +0200 +Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper + +prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. +It is not an error per se, but it breaks subprocess.check_output(). + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +Signed-off-by: Adam Duskett +--- + giscanner/shlibs.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index d67df95..80352a6 100644 +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries): + args.extend(['otool', '-L', binary.args[0]]) + else: + args.extend(['ldd', binary.args[0]]) +- output = subprocess.check_output(args) ++ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout + if isinstance(output, bytes): + output = output.decode("utf-8", "replace") + diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in new file mode 100644 index 0000000000..b93d5e4c45 --- /dev/null +++ b/package/gobject-introspection/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_GOBJECT_INTROSPECTION + bool "gobject-introspection" + depends on BR2_USE_MMU # python3, libglib2 + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_HOST_PRELINK_CROSS + select BR2_PACKAGE_HOST_QEMU + select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE + select BR2_PACKAGE_LIBFFI + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON + select BR2_PACKAGE_ZLIB + help + GObject introspection is a middleware layer between C + libraries (using GObject) and language bindings. The C library + can be scanned at compile time and generate a metadata file, + in addition to the actual native C library. Then at runtime, + language bindings can read this metadata and automatically + provide bindings to call into the C library. + + https://wiki.gnome.org/action/show/Projects/GObjectIntrospection + +comment "gobject-introspection needs a glibc toolchain" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in new file mode 100644 index 0000000000..579fd53fa4 --- /dev/null +++ b/package/gobject-introspection/g-ir-compiler.in @@ -0,0 +1,2 @@ +#!/bin/sh +$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/g-ir-compiler.real "$@" diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in new file mode 100644 index 0000000000..02f5c2883d --- /dev/null +++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in @@ -0,0 +1,2 @@ +#!/bin/sh +${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../../ "$@" diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in new file mode 100644 index 0000000000..b69222d27a --- /dev/null +++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in @@ -0,0 +1,17 @@ +#!/bin/sh + +# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel +# is older than the target kernel. +# Use a modules directory which does not exist so we don't load random things +# which may then get deleted (or their dependencies) and potentially segfault +GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \ +@QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \ +-L $(dirname $0)/../../ \ +-E LD_LIBRARY_PATH=$GIR_EXTRA_LIBS_PATH:.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib \ +"$@" + +if [ $? -ne 0 ]; then + echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help." + echo '(typically like this: GIR_EXTRA_LIBS_PATH="$(@D)/.libs")' + exit 1 +fi diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in new file mode 100644 index 0000000000..09530aad56 --- /dev/null +++ b/package/gobject-introspection/g-ir-scanner.in @@ -0,0 +1,7 @@ +#!/bin/sh +export GI_SCANNER_DISABLE_CACHE=1 +$HOST_DIR/bin/g-ir-scanner \ +--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ +--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \ +--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \ +--add-include-path=$(dirname $0)/../share/gir-1.0 "$@" diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash new file mode 100644 index 0000000000..86dcc691ae --- /dev/null +++ b/package/gobject-introspection/gobject-introspection.hash @@ -0,0 +1,4 @@ +#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.sha256sum +sha256 ffdfe2368fb2e34a547898b01aac0520d52d8627fdeb1c306559bcb503ab5e9c gobject-introspection-1.60.2.tar.xz +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk new file mode 100644 index 0000000000..4393347260 --- /dev/null +++ b/package/gobject-introspection/gobject-introspection.mk @@ -0,0 +1,103 @@ +################################################################################ +# +# gobject-introspection +# +################################################################################ + +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.60 +GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).2 +GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) +GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz +GOBJECT_INTROSPECTION_INSTALL_STAGING = YES +GOBJECT_INTROSPECTION_AUTORECONF = YES +GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+ or GPL-2.0+ +GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL + +GOBJECT_INTROSPECTION_DEPENDENCIES = \ + host-autoconf-archive \ + host-gobject-introspection \ + host-prelink-cross \ + python3 \ + host-qemu \ + libffi \ + libglib2 \ + zlib + +HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-libglib2 \ + host-python3 + +# g-ir-scanner will default to /usr/bin/ld for linking if this is not set. +GOBJECT_INTROSPECTION_NINJA_ENV += \ + CC="$(TARGET_CC)" + +# Use the host gi-scanner to prevent the scanner from generating incorrect +# elf classes. +GOBJECT_INTROSPECTION_CONF_OPTS = \ + -Denable-host-gi=true \ + -Denable-gi-cross-wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \ + -Denable-gi-ldd-wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \ + -Denable-introspection-data=true + +ifeq ($(BR2_PACKAGE_CAIRO),y) +GOBJECT_INTROSPECTION_DEPENDENCIES += cairo +GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=true +endif + +# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to $HOME +HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ + GI_SCANNER_DISABLE_CACHE=1 + +# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to $HOME +GOBJECT_INTROSPECTION_CONF_ENV = \ + GI_SCANNER_DISABLE_CACHE=1 + +# Make sure g-ir-tool-template uses the host python. +define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH + $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in +endef +GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH + +# These wrappers allow gobject-introspection to build the internal introspection +# libraries during the build process. +define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper + $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \ + $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper + # Use a modules directory which does not exist so we don't load random things + # which may then get deleted (or their dependencies) and potentially segfault + mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy +endef +GOBJECT_INTROSPECTION_POST_PATCH_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS + +# Move the real compiler and scanner to .real, and replace them with the wrappers. +define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + # Move the real binaries to their names.real, then replace them with + # the wrappers. + $(foreach w,g-ir-compiler g-ir-scanner, + mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real + $(INSTALL) -D -m 755 \ + $(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w) + ) + $(SED) "s%toolsdir=.*%toolsdir=$(STAGING_DIR)/usr/bin%g" \ + $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc +endef +GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + +# Only .typelib files are needed to run. +define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES + find $(TARGET_DIR)/usr/share/ -name '*.gir' -print0 | xargs -0 rm -f + find $(TARGET_DIR)/usr/share/ -name '*.rnc' -print0 | xargs -0 rm -f +endef +GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES + +$(eval $(meson-package)) +$(eval $(host-meson-package))