[Buildroot] [git commit] package/python-numpy: simplify PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Sat Jan 8 14:48:51 UTC 2022
commit: https://git.buildroot.net/buildroot/commit/?id=3093444e9cf0c5343677799c9130d3aeb342dc3d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES macro was introduced in
commit
2426002d6fc81d0b023e3f3b3ee4e94ab29438cb ("package/python-numpy: fixup
npymath.ini for numpy extensions").
However, it turns out that by using $(PYTHON3_PATH), we can simplify
the intermediate variables, to the point where they are no longer
needed. Not having the intermediate variables makes the logic a bit
easier to understand.
Also, the logic is changed to use a single sed expression, which we
pass to $(SED).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
package/python-numpy/python-numpy.mk | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
index f367b556ef..9e8b032b78 100644
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -40,12 +40,9 @@ endef
# it uses host libraries (like libnpymath.a).
# So, the numpy distutils extension packages would explicitly link this
# config path for their package environment.
-PYTHON_NUMPY_STAGING_DIR = $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy
-PYTHON_NUMPY_NPY_PKG_CONFIG_PATH=$(PYTHON_NUMPY_STAGING_DIR)/core/lib/npy-pkg-config
define PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES
- sed -e '/^pkgdir=/d' \
- -e '/^prefix=/i pkgdir=$(PYTHON_NUMPY_STAGING_DIR)/core' \
- -i $(PYTHON_NUMPY_NPY_PKG_CONFIG_PATH)/npymath.ini
+ $(SED) '/^pkgdir=/d;/^prefix=/i pkgdir=$(PYTHON3_PATH)/site-packages/numpy/core' \
+ $(PYTHON3_PATH)/site-packages/numpy/core/lib/npy-pkg-config/npymath.ini
endef
PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FILES
More information about the buildroot
mailing list