diff options
| -rwxr-xr-x | bin/ebuild-helpers/dohtml | 2 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/portageq | 2 | ||||
| -rwxr-xr-x | bin/ebuild-ipc | 2 | ||||
| -rwxr-xr-x | bin/misc-functions.sh | 23 | ||||
| -rw-r--r-- | pym/portage/tests/lint/test_compile_modules.py | 1 |
5 files changed, 25 insertions, 5 deletions
diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index c5bfd0637..e1ab7d970 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -6,7 +6,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} -# Set EPYTHON variable as empty so that dohtml doesn't try +# Set EPYTHON variable as empty so that dohtml.py doesn't try # to use potentially unsupported version of Python. EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ "$PORTAGE_BIN_PATH/dohtml.py" "$@" diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq index d1a1fb52b..3a06fdd68 100755 --- a/bin/ebuild-helpers/portageq +++ b/bin/ebuild-helpers/portageq @@ -4,7 +4,7 @@ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} -# Set EPYTHON variable as empty so that dohtml doesn't try +# Set EPYTHON variable as empty so that portageq doesn't try # to use potentially unsupported version of Python. EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ exec "$PORTAGE_BIN_PATH/portageq" "$@" diff --git a/bin/ebuild-ipc b/bin/ebuild-ipc index b30b89aea..b828a35cd 100755 --- a/bin/ebuild-ipc +++ b/bin/ebuild-ipc @@ -4,7 +4,7 @@ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} -# Set EPYTHON variable as empty so that dohtml doesn't try +# Set EPYTHON variable as empty so that ebuild-ipc.py doesn't try # to use potentially unsupported version of Python. EPYTHON= PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ exec "$PORTAGE_BIN_PATH/ebuild-ipc.py" "$@" diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 9777c9954..c965495b6 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -542,8 +542,27 @@ install_qa_check() { if [[ -n ${f} ]] ; then vecho -ne '\a\n' eqawarn "QA Notice: Byte-compiled Python modules have been found. python_mod_optimize()" - eqawarn " and python_mod_cleanup() functions python.eclass should be used to" - eqawarn " handle byte-compiled Python modules." + eqawarn " and python_mod_cleanup() functions from python.eclass should be used" + eqawarn " to handle byte-compiled Python modules." + eqawarn "${f}" + vecho -ne '\a\n' + fi + + f=$(find "${D}"usr/lib*/python*/site-packages -name '*.a' 2>/dev/null | sed "s:${D}:/:") + if [[ -n ${f} ]] ; then + vecho -ne '\a\n' + eqawarn "QA Notice: Static libraries have been found in Python site-packages" + eqawarn " directories. Build system should be modified to not generate" + eqawarn " these files and object files generated only for these files." + eqawarn "${f}" + vecho -ne '\a\n' + fi + + f=$(find "${D}"usr/lib*/python*/site-packages -name '*.la' 2>/dev/null | sed "s:${D}:/:") + if [[ -n ${f} ]] ; then + vecho -ne '\a\n' + eqawarn "QA Notice: Libtool libraries have been found in Python site-packages" + eqawarn " directories. These files should not be installed." eqawarn "${f}" vecho -ne '\a\n' fi diff --git a/pym/portage/tests/lint/test_compile_modules.py b/pym/portage/tests/lint/test_compile_modules.py index c6e68946e..2e5ab7e2d 100644 --- a/pym/portage/tests/lint/test_compile_modules.py +++ b/pym/portage/tests/lint/test_compile_modules.py @@ -47,3 +47,4 @@ class CompileModulesTestCase(TestCase): if do_compile: cfile += (__debug__ and 'c' or 'o') py_compile.compile(x, cfile=cfile, doraise=True) + os.unlink(cfile) |