openembedded-devel.lists.openembedded.org archive mirror
 help / color / mirror / Atom feed
From: Armin Kuster <akuster808@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [meta-oe][mickledore][PATCH 16/36] libpeas: Fix reference to TMPDIR in tests
Date: Wed, 31 May 2023 07:12:49 -0400	[thread overview]
Message-ID: <20230531111309.2454603-16-akuster808@gmail.com> (raw)
In-Reply-To: <20230531111309.2454603-1-akuster808@gmail.com>

From: Khem Raj <raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4921a6df059ad474e4451dde587640a3291d74b1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...-and-srcdir-paths-from-test-binaries.patch | 82 +++++++++++++++++++
 .../recipes-gnome/libpeas/libpeas_1.36.0.bb   |  1 +
 2 files changed, 83 insertions(+)
 create mode 100644 meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch

diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
new file mode 100644
index 0000000000..6bb48777ec
--- /dev/null
+++ b/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
@@ -0,0 +1,82 @@
+From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 18 May 2023 23:28:10 -0700
+Subject: [PATCH] Remove builddir and srcdir paths from test binaries
+
+Encoding buildtime paths is not needed since if these tests are to be
+run they will be run on target where builddir structure most certainly
+wont be available.
+
+Fixes
+WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths]
+
+Upstream-Status: Inappropriate [Cross-compile specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ peas-demo/meson.build                 | 2 +-
+ tests/libpeas-gtk/testing/meson.build | 4 ++--
+ tests/libpeas/testing/meson.build     | 4 ++--
+ tests/testing-util/meson.build        | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/peas-demo/meson.build b/peas-demo/meson.build
+index a3ec53b..855ebf2 100644
+--- a/peas-demo/meson.build
++++ b/peas-demo/meson.build
+@@ -9,7 +9,7 @@ peas_demo_c = [
+ 
+ peas_demo_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DPEAS_BUILDDIR="@0@"'.format(builddir),
++  '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"',
+   '-DPEAS_PREFIX="@0@"'.format(prefix),
+   '-DPEAS_LIBDIR="@0@"'.format(libdir),
+ ]
+diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
+index 646f42d..fd9a692 100644
+--- a/tests/libpeas-gtk/testing/meson.build
++++ b/tests/libpeas-gtk/testing/meson.build
+@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [
+ 
+ libpeas_gtk_testing_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DBUILDDIR="@0@"'.format(builddir),
+-  '-DSRCDIR="@0@"'.format(srcdir),
++  '-DBUILDDIR="/usr/src/debug/libpeas"',
++  '-DSRCDIR="/usr/src/debug/libpeas"',
+ ]
+ 
+ libpeas_gtk_testing_lib = library(
+diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
+index 74ba7b1..084daa9 100644
+--- a/tests/libpeas/testing/meson.build
++++ b/tests/libpeas/testing/meson.build
+@@ -21,8 +21,8 @@ libpeas_testing_deps = [
+ 
+ libpeas_testing_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DBUILDDIR="@0@"'.format(builddir),
+-  '-DSRCDIR="@0@"'.format(srcdir),
++  '-DBUILDDIR="/usr/src/debug/libpeas"',
++  '-DSRCDIR="/usr/src/debug/libpeas"',
+ ]
+ 
+ libpeas_testing_lib = library(
+diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
+index 1c40740..83ad059 100644
+--- a/tests/testing-util/meson.build
++++ b/tests/testing-util/meson.build
+@@ -17,8 +17,8 @@ libtesting_util_deps = [
+ 
+ libtesting_util_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DBUILDDIR="@0@"'.format(builddir),
+-  '-DSRCDIR="@0@"'.format(srcdir),
++  '-DBUILDDIR="/usr/src/debug/libpeas"',
++  '-DSRCDIR="/usr/src/debug/libpeas"',
+   '-UG_DISABLE_ASSERT',
+   '-UG_DISABLE_CAST_CHECKS',
+ ]
+-- 
+2.40.1
+
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
index 1282e93634..8262cc2212 100644
--- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
+++ b/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
@@ -12,6 +12,7 @@ inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
+SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
 SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
 
 PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
-- 
2.25.1



  parent reply	other threads:[~2023-05-31 11:13 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-31 11:12 [meta-oe][mickledore][PATCH 01/36] libencode-perl: Remove buildpaths from generated .exh files Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 02/36] frr: add CVE_PRODUCT Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 03/36] enca: Remove buildpaths from target scripts Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 04/36] libirecovery: Add missing build dependency on readline Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 05/36] fftw: Remove hardcoded sysroot into binaries Armin Kuster
2023-06-07  7:53   ` [oe] " Böszörményi Zoltán
2023-06-07  8:09     ` Khem Raj
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 06/36] lmdb: Pass CFLAGS to Makefile Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 07/36] postgresql: upgrade 15.2 -> 15.3 Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 08/36] ipmitool: Update links Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 09/36] minicoredumper: correct the sysvinit service file attribute Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 10/36] php: upgrade 8.2.5 -> 8.2.6 Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 11/36] php: Remove buildpaths from scripts and generated headers Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 12/36] libusbgx: drop hard-coded /usr/bin,/etc Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 13/36] libusbgx: check scripts in /etc/usbgx.d Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 14/36] uw-imap: Pass CFLAGS from environment Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 15/36] libmad: Add a patch to pass cflags to build Armin Kuster
2023-05-31 11:12 ` Armin Kuster [this message]
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 17/36] lirc: Define SH_PATH=/bin/sh Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 18/36] mce-inject: Pass CFLAGS to make Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 19/36] nbdkit: Remove buildpaths from binaries Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 20/36] mpv: Remove references to builddir from mpv binary Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 21/36] libnice: Remove buildpaths from binaries Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 22/36] curlpp: Remove references to buildpaths e.g. TMPDIR Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 23/36] unbound: Remove references to buildpaths Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 24/36] uml-utilities: Fix references to TMPDIR Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 25/36] openct: Fix buildpaths being emitted into generated types.h Armin Kuster
2023-05-31 11:12 ` [meta-oe][mickledore][PATCH 26/36] minifi-cpp: Remove references to buildpaths in generated files Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 27/36] freerdp: Fix reference to TMPDIR in libfreerdp2.so Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 28/36] nautilus: upgrade 44.0 -> 44.1 Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 29/36] nautilus: Fix buildpath QA errors Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 30/36] cgdb: Fix buildpaths emitted into cgdb binary Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 31/36] ibus: Point python interpreter to target location Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 32/36] gimp: Fix buildpaths in binaries and scripts Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 33/36] libgphoto2: Edit out sysroot from CC variable in configure Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 34/36] vlan: Pass CFLAGS via CCFLAGS Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 35/36] sgpio: Pass CFLAGS to make Armin Kuster
2023-05-31 11:13 ` [meta-oe][mickledore][PATCH 36/36] x265: Pass --debug-prefix-map to nasm Armin Kuster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230531111309.2454603-16-akuster808@gmail.com \
    --to=akuster808@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    --cc=raj.khem@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).