diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /sys-devel/automake/files | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'sys-devel/automake/files')
5 files changed, 0 insertions, 320 deletions
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch deleted file mode 100644 index bd5a6759c292..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-compile-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN automake-1.16.1.orig/t/py-compile-basedir.sh automake-1.16.1/t/py-compile-basedir.sh ---- automake-1.16.1.orig/t/py-compile-basedir.sh 2020-01-20 05:07:12.915260159 +0100 -+++ automake-1.16.1/t/py-compile-basedir.sh 2020-01-20 05:07:45.827074984 +0100 -@@ -42,7 +42,7 @@ - py_installed "$d2/$f.pyc" - py_installed "$d2/sub/$f.pyc" - files=$(find "$d2" | grep '\.py[co]$') -- test $(echo "$files" | wc -l) -eq 4 -+ test $(echo "$files" | wc -l) -eq 4 -o $(echo "$files" | wc -l) -eq 6 - case $d2 in - .|..) rm -f $files;; - *) rm -rf "$d2";; diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch deleted file mode 100644 index bbb08454763e..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d3edb7e0f3a5553b1ed919e566ec8c41022251a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sun, 3 Nov 2019 11:51:19 +0100 -Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- - lib/py-compile | 27 +++++++++++++++++++++++++-- - 1 file changed, 25 insertions(+), 2 deletions(-) - -diff --git a/lib/py-compile b/lib/py-compile -index 1a3f4d644..44be97fc4 100755 ---- a/lib/py-compile -+++ b/lib/py-compile -@@ -140,7 +140,7 @@ $PYTHON -O -c " - import sys, os, py_compile, imp - - # pypy does not use .pyo optimization --if hasattr(sys, 'pypy_translation_info'): -+if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000: - sys.exit(0) - - files = '''$files''' -@@ -154,7 +154,30 @@ for file in files.split(): - sys.stdout.write(file) - sys.stdout.flush() - if hasattr(imp, 'get_tag'): -- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) -+ py_compile.compile(filepath, imp.cache_from_source(filepath), path) -+ else: -+ py_compile.compile(filepath, filepath + 'o', path) -+sys.stdout.write('\n')" 2>/dev/null || : -+ -+$PYTHON -OO -c " -+import sys, os, py_compile, imp -+ -+# python<3.5 does not have split files for -O and -OO -+if sys.hexversion < 0x03050000: -+ sys.exit(0) -+ -+files = '''$files''' -+sys.stdout.write('Byte-compiling python modules (-OO versions) ...\n') -+for file in files.split(): -+ $pathtrans -+ $filetrans -+ if not os.path.exists(filepath) or not (len(filepath) >= 3 -+ and filepath[-3:] == '.py'): -+ continue -+ sys.stdout.write(file) -+ sys.stdout.flush() -+ if hasattr(imp, 'get_tag'): -+ py_compile.compile(filepath, imp.cache_from_source(filepath), path) - else: - py_compile.compile(filepath, filepath + 'o', path) - sys.stdout.write('\n')" 2>/dev/null || : --- -2.23.0 - diff --git a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch b/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch deleted file mode 100644 index 0d2ff91b620e..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-no-pyo-files.patch +++ /dev/null @@ -1,192 +0,0 @@ -From: Lukas Fleischer -Subject: python tests: Do not require .pyo files -Date: Sun, 20 May 2018 17:28:52 +0200 - -As of Python 3.5, but unoptimized and optimized bytecode are stored -within .pyc files; .pyo files are no longer generated. Update the Python -tests such that the test do not fail if .pyo files are missing. - -Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00002.html -Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> - -* t/py-compile-basedir.sh: Remove all .pyo checks. -* t/py-compile-basic.sh: Likewise. -* t/py-compile-destdir.sh: Likewise. -* t/py-compile-option-terminate.sh: Likewise. -* t/python-virtualenv.sh: Likewise. -* t/python10.sh: Likewise. -* t/python12.sh: Likewise. -* t/python3.sh: Likewise. ---- - t/py-compile-basedir.sh | 2 -- - t/py-compile-basic.sh | 3 --- - t/py-compile-destdir.sh | 12 +++++------- - t/py-compile-option-terminate.sh | 5 ----- - t/python-virtualenv.sh | 4 ---- - t/python10.sh | 6 ------ - t/python12.sh | 3 +-- - t/python3.sh | 1 - - 8 files changed, 6 insertions(+), 30 deletions(-) - -diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh -index 6921d16d5..9f927d066 100644 ---- a/t/py-compile-basedir.sh -+++ b/t/py-compile-basedir.sh -@@ -40,9 +40,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do - ./py-compile --basedir "$d" "$f.py" "sub/$f.py" - find "$d2" # For debugging. - py_installed "$d2/$f.pyc" -- py_installed "$d2/$f.pyo" - py_installed "$d2/sub/$f.pyc" -- py_installed "$d2/sub/$f.pyo" - files=$(find "$d2" | grep '\.py[co]$') - test $(echo "$files" | wc -l) -eq 4 - case $d2 in -diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh -index 24df600cb..4c5cf57aa 100644 ---- a/t/py-compile-basic.sh -+++ b/t/py-compile-basic.sh -@@ -61,10 +61,7 @@ mkdir -p 1/_/2/_/3/_ - - ./py-compile foo.py sub/bar.py 1/_/2/_/3/_/0.py - py_installed foo.pyc --py_installed foo.pyo - py_installed sub/bar.pyc --py_installed sub/bar.pyo - py_installed 1/_/2/_/3/_/0.pyc --py_installed 1/_/2/_/3/_/0.pyo - - : -diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh -index 07aa1f44f..d2ccafee5 100644 ---- a/t/py-compile-destdir.sh -+++ b/t/py-compile-destdir.sh -@@ -34,13 +34,11 @@ echo 'def bar (): return "bar"' > $destdir/sub/bar.py - - find $destdir # For debugging. - st=0 --for x in c o; do -- for b in foo sub/bar; do -- f=$(pyc_location -p "$destdir/$b.py$x") -- test -f "$f" -- strings "$f" || : # For debugging. -- $FGREP $destdir $f && { echo BAD: $f; st=1; } -- done -+for b in foo sub/bar; do -+ f=$(pyc_location -p "$destdir/$b.pyc") -+ test -f "$f" -+ strings "$f" || : # For debugging. -+ $FGREP $destdir $f && { echo BAD: $f; st=1; } - done - exit $st - -diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh -index 1aaeec21b..80ae55a88 100644 ---- a/t/py-compile-option-terminate.sh -+++ b/t/py-compile-option-terminate.sh -@@ -27,17 +27,12 @@ cp "$am_scriptdir/py-compile" . \ - : > ./--foo.py - ./py-compile -- -o.py --foo.py - py_installed ./-o.pyc --py_installed ./-o.pyo - py_installed ./--foo.pyc --py_installed ./--foo.pyo - rm -f ./-*.py[co] - : > x.py - ./py-compile x.py -o.py --foo.py - py_installed ./x.pyc --py_installed ./x.pyo - py_installed ./-o.pyc --py_installed ./-o.pyo - py_installed ./--foo.pyc --py_installed ./--foo.pyo - - : -diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh -index 3bcd6ec76..7f9708866 100644 ---- a/t/python-virtualenv.sh -+++ b/t/python-virtualenv.sh -@@ -124,10 +124,8 @@ check_install () - - test -f "$py_site"/am_foo.py - py_installed "$py_site"/am_foo.pyc -- py_installed "$py_site"/am_foo.pyo - py_installed "$py_site"/am_virtenv/__init__.py - py_installed "$py_site"/am_virtenv/__init__.pyc -- py_installed "$py_site"/am_virtenv/__init__.pyo - test -f "$py_site"/libquux.a - test -f "$py_site"/am_virtenv/libzardoz.a - } -@@ -138,10 +136,8 @@ check_uninstall () - - test ! -e "$py_site"/am_foo.py - py_installed --not "$py_site"/am_foo.pyc -- py_installed --not "$py_site"/am_foo.pyo - test ! -e "$py_site"/am_virtenv/__init__.py - py_installed --not "$py_site"/am_virtenv/__init__.pyc -- py_installed --not "$py_site"/am_virtenv/__init__.pyo - test ! -e "$py_site"/libquux.a - test ! -e "$py_site"/am_virtenv/libzardoz.a - } -diff --git a/t/python10.sh b/t/python10.sh -index 4def103ff..9c7a46175 100644 ---- a/t/python10.sh -+++ b/t/python10.sh -@@ -60,27 +60,21 @@ cwd=$(pwd) || fatal_ "getting current working directory" - $MAKE install - test -f "$inst/your/two.py" - py_installed "$inst/your/two.pyc" --py_installed "$inst/your/two.pyo" - py_installed --not "$inst/my/one.py" - py_installed --not "$inst/my/one.pyc" --py_installed --not "$inst/my/one.pyo" - $MAKE uninstall - py_installed --not "$inst/your/two.py" - py_installed --not "$inst/your/two.pyc" --py_installed --not "$inst/your/two.pyo" - - ../configure --prefix=$cwd/"$inst" one=1 - $MAKE install - py_installed --not "$inst/your/two.py" - py_installed --not "$inst/your/two.pyc" --py_installed --not "$inst/your/two.pyo" - test -f "$inst/my/one.py" - py_installed "$inst/my/one.pyc" --py_installed "$inst/my/one.pyo" - $MAKE uninstall - py_installed --not "$inst/my/one.py" - py_installed --not "$inst/my/one.pyc" --py_installed --not "$inst/my/one.pyo" - - $MAKE disttest - -diff --git a/t/python12.sh b/t/python12.sh -index d998ae8ad..cca057e6d 100644 ---- a/t/python12.sh -+++ b/t/python12.sh -@@ -44,11 +44,10 @@ $MAKE install DESTDIR=$destdir - - # Perfunctory test that the files were created. - test -f "$destdir/usr/share/my/my.py" --pyo=$(pyc_location -p "$destdir/usr/share/my/my.pyo") - pyc=$(pyc_location -p "$destdir/usr/share/my/my.pyc") - - # If DESTDIR has made it into the byte compiled files, fail the test. --st=0; $FGREP "$destdir" "$pyc" "$pyo" || st=$? -+st=0; $FGREP "$destdir" "$pyc" || st=$? - test $st -eq 1 - - : -diff --git a/t/python3.sh b/t/python3.sh -index 0008eadd7..131aeb48d 100644 ---- a/t/python3.sh -+++ b/t/python3.sh -@@ -42,6 +42,5 @@ cd build - $MAKE install - py_installed inst/my/one.py - py_installed inst/my/one.pyc --py_installed inst/my/one.pyo - - : --- -2.17.0 diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch deleted file mode 100644 index 7ece18ebc300..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147-cmdline.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN automake-1.16.1.orig/t/instmany-python.sh automake-1.16.1/t/instmany-python.sh ---- automake-1.16.1.orig/t/instmany-python.sh 2018-02-26 21:38:28.000000000 +0100 -+++ automake-1.16.1/t/instmany-python.sh 2020-01-20 02:44:37.192352310 +0100 -@@ -21,7 +21,11 @@ - required='python' - . test-init.sh - --limit=2500 -+limit=3200 -+# Let's increase the number here a bit, otherwise the __pycache__ dirs -+# make the test fail. I know this is a hack, but does anything conform -+# to the POSIX limit of 4096 still anyway? -+ - subdir=long_subdir_name_with_many_characters - nfiles=81 - list=$(seq_ 1 $nfiles) diff --git a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch b/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch deleted file mode 100644 index 545544d89feb..000000000000 --- a/sys-devel/automake/files/automake-1.16.1-py3-pep3147.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Lukas Fleischer -Subject: python: Properly uninstall __pycache__ in subdirectories -Date: Sun, 20 May 2018 17:28:51 +0200 - -When uninstalling __pycache__ files in a subdirectory "sub", the -Makefile incorrectly removed the files from __pycache__/sub/ instead of -sub/__pycache__/. - -* lib/am/python.am (uninstall-%DIR%PYTHON): Use the correct path when -uninstalling byte-compiled files installed in '__pycache__' -subdirectories. - -Source: https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html -Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org> ---- - lib/am/python.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff -ruN automake-1.16.1.orig/lib/am/python.am automake-1.16.1/lib/am/python.am ---- automake-1.16.1.orig/lib/am/python.am 2018-02-26 21:38:27.000000000 +0100 -+++ automake-1.16.1/lib/am/python.am 2020-01-19 05:35:01.212177206 +0100 -@@ -97,7 +97,7 @@ - if %?INSTALL% - - ?FIRST?am__pep3147_tweak = \ --?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' -+?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc\n__pycache__/&.*.pyo|' - - .PHONY uninstall-am: uninstall-%DIR%PYTHON - uninstall-%DIR%PYTHON: -@@ -116,7 +116,7 @@ - done; \ - ## This is somewhat tricky, because for newer pythons we have to take PEP-3147 - ## into account. Avoid exceeding the command-line length limit. -- dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ -+ dir='$(DESTDIR)$(%NDIR%dir)'; \ - echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ - while read files; do \ - $(am__uninstall_files_from_dir) || st=$$?; \ |