From 04da00b14810f1f9e43db162e6fa8329f0a31980 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 4 Jul 2018 23:06:53 -0700 Subject: libbytesize: Upgrade to 1.3 * Remove 0001-remove-python2-support.patch and use configure option to control the python2 support. * Update PV to reflect the version change Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../files/0001-remove-python2-support.patch | 30 ------------------- .../libbytesize/libbytesize_0.10.bb | 34 ---------------------- .../recipes-support/libbytesize/libbytesize_1.3.bb | 34 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 64 deletions(-) delete mode 100644 meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch delete mode 100644 meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb create mode 100644 meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb (limited to 'meta-oe') 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 -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 ---- - 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_0.10.bb deleted file mode 100644 index 6903021490..0000000000 --- a/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb +++ /dev/null @@ -1,34 +0,0 @@ -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+" -SECTION = "devel/lib" - -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 \ -" - -inherit gettext autotools python3native - -DEPENDS += " \ - libpcre \ - gmp \ - mpfr \ -" - -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" - -EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" - - diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb b/meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb new file mode 100644 index 0000000000..caf84de2c5 --- /dev/null +++ b/meta-oe/recipes-support/libbytesize/libbytesize_1.3.bb @@ -0,0 +1,34 @@ +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+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "b0dcf6f457d700127b43c0e0a198253c266b78ae" +PV = "1.3+git${SRCPV}" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master \ +" + +inherit gettext autotools python3native + +DEPENDS += " \ + libpcre \ + gmp \ + mpfr \ +" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" + +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python2" +PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" + +EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" + + -- cgit 1.2.3-korg