diff options
| -rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-scons-native_4.3.0.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-scons_4.3.0.bb | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 7a65612b7c..c17ebb8604 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
| @@ -636,7 +636,6 @@ RECIPE_MAINTAINER:pn-python3-rfc3986-validator = "Bruce Ashfield <bruce.ashfield | |||
| 636 | RECIPE_MAINTAINER:pn-python3-rfc3987 = "Bruce Ashfield <bruce.ashfield@gmail.com>" | 636 | RECIPE_MAINTAINER:pn-python3-rfc3987 = "Bruce Ashfield <bruce.ashfield@gmail.com>" |
| 637 | RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <bruce.ashfield@gmail.com>" | 637 | RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <bruce.ashfield@gmail.com>" |
| 638 | RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <tim.orling@konsulko.com>" | 638 | RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <tim.orling@konsulko.com>" |
| 639 | RECIPE_MAINTAINER:pn-python3-scons-native = "Tim Orling <tim.orling@konsulko.com>" | ||
| 640 | RECIPE_MAINTAINER:pn-python3-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" | 639 | RECIPE_MAINTAINER:pn-python3-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>" |
| 641 | RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Tim Orling <tim.orling@konsulko.com>" | 640 | RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Tim Orling <tim.orling@konsulko.com>" |
| 642 | RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <zangrc.fnst@fujitsu.com>" | 641 | RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <zangrc.fnst@fujitsu.com>" |
diff --git a/meta/recipes-devtools/python/python3-scons-native_4.3.0.bb b/meta/recipes-devtools/python/python3-scons-native_4.3.0.bb deleted file mode 100644 index 73076b8732..0000000000 --- a/meta/recipes-devtools/python/python3-scons-native_4.3.0.bb +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | require python3-scons_${PV}.bb | ||
| 2 | inherit native python3native | ||
| 3 | DEPENDS = "python3-native python3-setuptools-native" | ||
| 4 | |||
| 5 | do_install:append() { | ||
| 6 | create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' | ||
| 7 | } | ||
diff --git a/meta/recipes-devtools/python/python3-scons_4.3.0.bb b/meta/recipes-devtools/python/python3-scons_4.3.0.bb index bff2fdae92..cfb075f65f 100644 --- a/meta/recipes-devtools/python/python3-scons_4.3.0.bb +++ b/meta/recipes-devtools/python/python3-scons_4.3.0.bb | |||
| @@ -8,6 +8,7 @@ SRC_URI += " file://0001-Fix-man-page-installation.patch" | |||
| 8 | SRC_URI[sha256sum] = "d47081587e3675cc168f1f54f0d74a69b328a2fc90ec4feb85f728677419b879" | 8 | SRC_URI[sha256sum] = "d47081587e3675cc168f1f54f0d74a69b328a2fc90ec4feb85f728677419b879" |
| 9 | 9 | ||
| 10 | PYPI_PACKAGE = "SCons" | 10 | PYPI_PACKAGE = "SCons" |
| 11 | PIP_INSTALL_DIST_PATH = "${B}/build/dist" | ||
| 11 | 12 | ||
| 12 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
| 13 | 14 | ||
| @@ -24,4 +25,14 @@ RDEPENDS:${PN}:class-target = "\ | |||
| 24 | python3-pprint \ | 25 | python3-pprint \ |
| 25 | " | 26 | " |
| 26 | 27 | ||
| 27 | FILES:${PN}-doc += "${datadir}/scons*.1" | 28 | do_install:append() { |
| 29 | install -d ${D}${mandir}/man1 | ||
| 30 | mv ${D}${prefix}/scons*.1 ${D}${mandir}/man1/ | ||
| 31 | } | ||
| 32 | FILES:${PN}-doc += "${mandir}/man1/scons*.1" | ||
| 33 | |||
| 34 | do_install:append:class-native() { | ||
| 35 | create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' | ||
| 36 | } | ||
| 37 | |||
| 38 | BBCLASSEXTEND = "native" | ||
