From patchwork Wed May 31 11:12:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 24907 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 577A9C7EE33 for ; Wed, 31 May 2023 11:13:43 +0000 (UTC) Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) by mx.groups.io with SMTP id smtpd.web10.11456.1685531618141214852 for ; Wed, 31 May 2023 04:13:38 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=clRnDKC4; spf=pass (domain: gmail.com, ip: 209.85.219.176, mailfrom: akuster808@gmail.com) Received: by mail-yb1-f176.google.com with SMTP id 3f1490d57ef6-b9a6eec8611so1239387276.0 for ; Wed, 31 May 2023 04:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685531617; x=1688123617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j+f94rYmWdZXto3Kfh+2m5tUeEYJWLsMS//MD2difFc=; b=clRnDKC4BTUuIKD4k+3lhz7BDZYGtXpX7uiaEe30sOOS8FAE1b51FMOOsc0jEYXvoR u7AP+6yl7UKO3rIid1MBurvBZ7au5cNDSUrOWSkh3M6LJuYN3tDCuD86no3+Zdnsjgv1 OkaFIGY86EfCswJ6FV/sBQRJcUQGrHjv3s+RkHFun+XZLIz5kR/MpXKgTS1+bXqwTNuO xp0p1HGFDUSsKm/dSbGX233DAsoonD1C3Lw3rgCiLfiPcIi3s4sVpksrEZM4vYIY3yP/ 0Ph+utVxlILT0ArOPO/iZ040Lwtzbr/NZVnnEDY0eRFujsc25b7DmbPrW+g9rDAzdWQC c/tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685531617; x=1688123617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j+f94rYmWdZXto3Kfh+2m5tUeEYJWLsMS//MD2difFc=; b=QGFqoONMbiDQig+uFICDmZtmbxREzKMQPGedQtDwdxnnwHFDQR6X//SGSx4gCInMst hCbPVpQ0m8fPcl9s5RisTXNu3Ns3XP3yFtLI/B6DtZ1ayMWBwU3AcQH5UiHikgQU5RH6 rycLiwrpGx2KAPiRVtO7t0sofGsrNtFR6k1nA5ax6UYDPFwzfSBzND1N+xuPeFOCoqU5 RB7IieMuYYFvFy9+NGf6/DOp8BNlmSp7myB4+fHDGKbrH03dCxu+D1sc5zgfAcOO3AF4 42iFUVEs9/8rJnVLFbJoHFspPGxsKLHhrUzPv+mFDGG0XI9E+C7xMappqZ3XIot1MtGl j9vQ== X-Gm-Message-State: AC+VfDz1X1gTWLBBmtEWAXDO3Z1wUTG89yZS288Ls1DxxFvyhKcXHN4S uDnlDij9k5cUdanLKz9/hDchEw3oX/w= X-Google-Smtp-Source: ACHHUZ5yeRMqb+mOzalHCHdWrflDCFpU1x5r4YGZQbBzokbhwICVYXe8nuliAhokaVdbyc8wl9gokA== X-Received: by 2002:a0d:db89:0:b0:55a:c779:d8c0 with SMTP id d131-20020a0ddb89000000b0055ac779d8c0mr5540335ywe.22.1685531617132; Wed, 31 May 2023 04:13:37 -0700 (PDT) Received: from keaua.attlocal.net ([2600:1700:9190:ba10:a3c5:f403:52db:88cf]) by smtp.gmail.com with ESMTPSA id t129-20020a814687000000b00545a08184fdsm5246897ywa.141.2023.05.31.04.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 04:13:36 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Khem Raj 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 Message-Id: <20230531111309.2454603-26-akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230531111309.2454603-1-akuster808@gmail.com> References: <20230531111309.2454603-1-akuster808@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 31 May 2023 11:13:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/103055 From: Khem Raj 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 Signed-off-by: Khem Raj (cherry picked from commit 0d2df1e4c404fd93ee0095a15db00d17f2321e18) Signed-off-by: Armin Kuster --- 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}||g' ${S}/libminifi/include/agent/agent_version.h +} + CFLAGS:append:libc-glibc = " -D_GNU_SOURCE" CXXFLAGS:append:libc-glibc = " -D_GNU_SOURCE"