diff options
Diffstat (limited to 'meta-oe/recipes-support/libbytesize')
| -rw-r--r-- | meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb (renamed from meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb) | 22 |
2 files changed, 9 insertions, 43 deletions
diff --git a/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch b/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch deleted file mode 100644 index b57e39fbcc..0000000000 --- a/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2ddc97b30792817d162f51ec3818376aefbf184e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 3 May 2017 02:05:33 -0400 -Subject: [PATCH] remove python2 support - -We use python3 rather than python2 support - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/python/Makefile.am | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/python/Makefile.am b/src/python/Makefile.am -index 567d0d7..8d9f446 100644 ---- a/src/python/Makefile.am -+++ b/src/python/Makefile.am -@@ -1,8 +1,3 @@ --pylibdir = $(shell python -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") -- --pybytesizedir = $(pylibdir)/bytesize --dist_pybytesize_DATA = bytesize.py __init__.py -- - if WITH_PYTHON3 - py3libdir = $(shell python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(1,0,prefix='${exec_prefix}'))") - py3bytesizedir = $(py3libdir)/bytesize --- -2.8.1 - diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb index 6903021490..dfc7b42dca 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The goal of this project is to provide a tiny library that would \ facilitate the common operations with sizes in bytes." HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" @@ -9,26 +9,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "369127c0edbba7d1a4e2e02486375dd9d379524f" -PV = "0.10+git${SRCPV}" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ - file://0001-remove-python2-support.patch \ -" +SRCREV = "2fa27aa3acccc70b9f6c3bf2e569e3d33a381e83" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" -inherit gettext autotools python3native +inherit gettext autotools pkgconfig python3native DEPENDS += " \ - libpcre \ + libpcre2 \ gmp \ mpfr \ + gettext-native \ " -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" +EXTRA_OECONF = "--without-gtk-doc" EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" - - |