libpwquality: upgrade 1.4.0 -> 1.4.2

refresh add-missing-python-include-dir-for-cross.patch

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2020-03-03 03:51:57 -08:00
committed by Khem Raj
parent 2fe19e3048
commit 6b17a48152
2 changed files with 13 additions and 18 deletions
@@ -13,28 +13,23 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2 files changed, 3 insertions(+), 2 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/python/Makefile.am b/python/Makefile.am diff --git a/python/Makefile.am b/python/Makefile.am
index abc5cd3..e35ba71 100644 index 1d00c0c..52816b2 100644
--- a/python/Makefile.am --- a/python/Makefile.am
+++ b/python/Makefile.am +++ b/python/Makefile.am
@@ -14,4 +14,4 @@ all-local: @@ -14,7 +14,7 @@ all-local:
CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV)
install-exec-local: install-exec-local:
- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} - 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 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} --install-lib=${DESTDIR}/${PYTHONSITEDIR}
clean-local:
rm -rf py$(PYTHONREV)
diff --git a/python/setup.py.in b/python/setup.py.in 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 --- a/python/setup.py.in
+++ b/python/setup.py.in +++ b/python/setup.py.in
@@ -6,6 +6,7 @@ @@ -33,7 +33,7 @@ class sdist(_sdist):
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):
pwqmodule = Extension('pwquality', pwqmodule = Extension('pwquality',
sources = ['pwquality.c'], sources = ['pwquality.c'],
@@ -44,5 +39,5 @@ index 6457595..d3db0e5 100755
libraries = ['pwquality']) libraries = ['pwquality'])
-- --
1.9.1 2.17.1
@@ -9,8 +9,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/${SRCNAME}
file://add-missing-python-include-dir-for-cross.patch \ file://add-missing-python-include-dir-for-cross.patch \
" "
SRC_URI[md5sum] = "b8defcc7280a90e9400d6689c93a279c" SRC_URI[md5sum] = "ae6e61fc33f5dac0de5e847eb7520d71"
SRC_URI[sha256sum] = "1de6ff046cf2172d265a2cb6f8da439d894f3e4e8157b056c515515232fade6b" SRC_URI[sha256sum] = "5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e"
UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases" UPSTREAM_CHECK_URI = "https://github.com/libpwquality/libpwquality/releases"