diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
| commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
| tree | 9f1f0dee23e13658e52f49437befe78427148c51 /sys-libs/libxcrypt/files | |
| parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) | |
gentoo resync : 10.02.2020
Diffstat (limited to 'sys-libs/libxcrypt/files')
| -rw-r--r-- | sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch | 25 | ||||
| -rw-r--r-- | sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch | 17 |
2 files changed, 42 insertions, 0 deletions
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch new file mode 100644 index 000000000000..806213036886 --- /dev/null +++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 26db1c1..597c3f4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -84,11 +84,7 @@ noinst_HEADERS = \ + test/des-cases.h \ + test/ka-table.inc + +-if ENABLE_XCRYPT_COMPAT_FILES + nodist_include_HEADERS += xcrypt.h +-else +-nodist_noinst_HEADERS += xcrypt.h +-endif + + noinst_PROGRAMS = \ + lib/gen-des-tables +@@ -137,7 +133,7 @@ uninstall_hook_targets = \ + uninstall-hook-pkgconfig + install-data-hook-pkgconfig: + cd $(DESTDIR)$(pkgconfigdir) && \ +- $(LN_S) libxcrypt.pc libcrypt.pc ++ $(LN_S) -f libxcrypt.pc libcrypt.pc + uninstall-hook-pkgconfig: + -rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc + diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch new file mode 100644 index 000000000000..048a8ebe0a70 --- /dev/null +++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index 1e74bb1..4249fb5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -241,11 +241,7 @@ ENABLE_KA_TABLE_GEN="no" + # This way we just need one call to AC_PATH_PROGS to likely get a + # suitable version of Python. The version check afterwards is for + # the case just a generic 'python3' or 'python' executable was found. +-PYTHON_CANDIDATE_VERSIONS="python3 python" +- +-for ver in `seq 6 1 10`; do +- PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS" +-done ++PYTHON_CANDIDATE_VERSIONS="${EPYTHON}" + + AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], []) + |