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 26/36] minifi-cpp: Remove references to buildpaths in generated files
Date: Wed, 31 May 2023 07:12:59 -0400	[thread overview]
Message-ID: <20230531111309.2454603-26-akuster808@gmail.com> (raw)
In-Reply-To: <20230531111309.2454603-1-akuster808@gmail.com>

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

bison/flex emits line directives which can be safely removed from
generated files.

agent_version.h is generated by cmake which has build information like
compiler and cflags etc. which contains buildpaths too, therefore
replace real workdir with <WORKDIR>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 0d2df1e4c404fd93ee0095a15db00d17f2321e18)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
index b76f120ee1..9ae72d2e99 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
@@ -61,6 +61,8 @@ EXTRA_OECMAKE += " \
     -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
     -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
     -DDISABLE_PYTHON_SCRIPTING=ON \
+    -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
+    -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines --file-prefix-map=${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}' \
     "
 EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib"
 LDFLAGS:append:toolchain-clang = " -fuse-ld=lld"
@@ -88,6 +90,10 @@ do_configure:prepend:libc-musl() {
     sed -i -e 's/-DHAVE_POSIX_STRERROR_R=0/-DHAVE_POSIX_STRERROR_R=1/' ${S}/CMakeLists.txt
 }
 
+do_configure:append() {
+    sed -i -e 's|${WORKDIR}|<WORKDIR>|g' ${S}/libminifi/include/agent/agent_version.h
+}
+
 CFLAGS:append:libc-glibc = " -D_GNU_SOURCE"
 CXXFLAGS:append:libc-glibc = " -D_GNU_SOURCE"
 
-- 
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 ` [meta-oe][mickledore][PATCH 16/36] libpeas: Fix reference to TMPDIR in tests Armin Kuster
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 ` Armin Kuster [this message]
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-26-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).