Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1a65860 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi
Browse files

floss: Uprev modp_b64 package to R110

Bug: 267796404
Tag: #floss
Test: cd sytem/build/dpkg/modp_b64 && ./gen-src-pkg.sh output
Change-Id: Ib7e7dc017796e5198f1be219db8a5b83acfe13c2
parent 5df93799
Loading
Loading
Loading
Loading
+0 −36
Original line number Diff line number Diff line
From 04fa5e1ade08696b5a2cc3b65bf0fd26c43251c7 Mon Sep 17 00:00:00 2001
From: Sonny Sasaka <sonnysasaka@chromium.org>
Date: Fri, 19 Mar 2021 11:17:43 -0700
Subject: [PATCH] common-mk: rebase_path output location of generate-pc.py

Without rebase_path, the generate-pc.py would be called like
`generate-pc.py --output //out/Release` if the output is inside the
source directory and this gn path isn't recognized as a generic
filesystem path.

BUG=b:183216216
TEST=with modp_b64, call
$ gn gen out/Release --args=...
$ ninja

Change-Id: Ic9d9b3d01d52d483e3d81ca2e8d514b47900f5bb
---
 common-mk/pkg_config.gni | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common-mk/pkg_config.gni b/common-mk/pkg_config.gni
index 24e2cf1401..b2c58845d4 100644
--- a/common-mk/pkg_config.gni
+++ b/common-mk/pkg_config.gni
@@ -84,7 +84,7 @@ template("generate_pkg_config") {
     outputs = [ "${target_out_dir}/${output_name}.pc" ]
 
     script = "//common-mk/generate-pc.py"
-    args = [ "--output" ] + outputs + [ "--name=" + name ]
+    args = [ "--output" ] + rebase_path(outputs) + [ "--name=" + name ]
     if (defined(description)) {
       args += [ "--description=" + description ]
     }
-- 
2.29.2
+0 −1
Original line number Diff line number Diff line
0001-common-mk-rebase_path-output-location-of-generate-pc.patch
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ defines += cc=\"clang\"
defines += ar=\"ar\"
defines += enable_werror=false
defines += libdir=\"/usr/lib\"
defines += use={mojo=false asan=false coverage=false crypto=true dbus=true fuzzer=false timers=true cros_host=false profiling=false tcmalloc=false}
defines += use={mojo=false asan=false coverage=false crypto=true dbus=true fuzzer=false timers=true cros_host=false cros_debug=false profiling=false tcmalloc=false}

# handle parallel build options
njobs=1
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ outdir="$1"
pkgdir=modp-b64-0.0.1
origtar=modp-b64_0.0.1.orig.tar.gz
scriptdir="$( cd "$( dirname "$0" )" && pwd )"
branch=release-R90-13816.B
branch=release-R110-15278.B

tmpdir=$(mktemp -d)
echo Generating source package in "${tmpdir}".