devicetree-compiler.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: Devicetree Compiler <devicetree-compiler@vger.kernel.org>
Cc: David Gibson <david@gibson.dropbear.id.au>,
	Gua Guo <gua.guo@intel.com>, Simon Glass <sjg@chromium.org>
Subject: [PATCH 5/6] setup: Move setting of srcdir down to the bottom
Date: Sun, 11 Aug 2024 09:02:47 -0600	[thread overview]
Message-ID: <20240811150248.7537-5-sjg@chromium.org> (raw)
In-Reply-To: <20240811150248.7537-1-sjg@chromium.org>

Put this variable assignment next to the others. Pass it to
get_top_builddir() instead of relying on the global variable.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 setup.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index be3cf90..52844ce 100755
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,6 @@ from setuptools import setup, Extension
 from setuptools.command.build_py import build_py as _build_py
 
 
-srcdir = os.path.dirname(__file__)
-
 def scan_for_info(srcdir):
     """Scan for the version and long_description fields
 
@@ -35,9 +33,12 @@ def scan_for_info(srcdir):
     return version, long_description
 
 
-def get_top_builddir():
+def get_top_builddir(srcdir):
     """Figure out the top-level directory containing the source code
 
+    Args:
+        srcdir (str): Source-directory path
+
     Returns:
         str: Directory to build in
     """
@@ -55,8 +56,8 @@ class BuildPy(_build_py):
         return super().run()
 
 
+srcdir = os.path.dirname(__file__)
 version, long_description = scan_for_info(srcdir)
-top_builddir = get_top_builddir()
 
 libfdt_module = Extension(
     '_libfdt',
@@ -64,7 +65,7 @@ libfdt_module = Extension(
     define_macros=[('PY_SSIZE_T_CLEAN', None)],
     include_dirs=[os.path.join(srcdir, 'libfdt')],
     libraries=['fdt'],
-    library_dirs=[os.path.join(top_builddir, 'libfdt')],
+    library_dirs=[os.path.join(get_top_builddir(srcdir), 'libfdt')],
     swig_opts=['-I' + os.path.join(srcdir, 'libfdt')],
 )
 
-- 
2.34.1


  parent reply	other threads:[~2024-08-11 15:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-11 15:02 [PATCH 1/6] Require Python 3 Simon Glass
2024-08-11 15:02 ` [PATCH 2/6] Tidy up some pylint warnings Simon Glass
2024-08-12  1:40   ` David Gibson
2024-08-11 15:02 ` [PATCH 3/6] setup: Move version and full_description into a function Simon Glass
2024-08-12  1:42   ` David Gibson
2024-08-11 15:02 ` [PATCH 4/6] setup: Collect top-level code together Simon Glass
2024-08-11 15:02 ` Simon Glass [this message]
2024-08-12  1:50   ` [PATCH 5/6] setup: Move setting of srcdir down to the bottom David Gibson
2024-08-11 15:02 ` [PATCH 6/6] setup: Add dependencies for Windows Simon Glass
2024-08-12  1:51   ` David Gibson
2024-08-12  2:01     ` David Gibson
2024-08-14  2:15       ` Simon Glass
2024-08-11 15:05 ` [PATCH 1/6] Require Python 3 Simon Glass
2024-08-12  1:39 ` David Gibson

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=20240811150248.7537-5-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=david@gibson.dropbear.id.au \
    --cc=devicetree-compiler@vger.kernel.org \
    --cc=gua.guo@intel.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).