diff options
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r-- | meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb (renamed from meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb) | 4 |
2 files changed, 13 insertions, 18 deletions
diff --git a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch index d12492f022..ec8672107f 100644 --- a/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch +++ b/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch @@ -13,28 +13,23 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am -index abc5cd3..e35ba71 100644 +index 1d00c0c..52816b2 100644 --- a/python/Makefile.am +++ b/python/Makefile.am -@@ -14,4 +14,4 @@ all-local: - CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install-exec-local: -- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} -+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} + + clean-local: + rm -rf py$(PYTHONREV) diff --git a/python/setup.py.in b/python/setup.py.in -index 6457595..d3db0e5 100755 +index a741b91..6759a95 100755 --- a/python/setup.py.in +++ b/python/setup.py.in -@@ -6,6 +6,7 @@ - - from distutils.core import setup, Extension - from distutils.command.build_ext import build_ext as _build_ext -+import os - - class build_ext(_build_ext): - def genconstants(self, headerfile, outputfile): -@@ -23,7 +24,7 @@ class build_ext(_build_ext): +@@ -33,7 +33,7 @@ class sdist(_sdist): pwqmodule = Extension('pwquality', sources = ['pwquality.c'], @@ -44,5 +39,5 @@ index 6457595..d3db0e5 100755 libraries = ['pwquality']) -- -1.9.1 +2.17.1 diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb index 9fb25cdc75..24d2f7ec1e 100644 --- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb +++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.2.bb @@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME} file://add-missing-python-include-dir-for-cross.patch \ " -SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" -SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" +SRC_URI[md5sum] = "ae6e61fc33f5dac0de5e847eb7520d71" +SRC_URI[sha256sum] = "5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e" UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases" |