commit: 190736be5dde352c014202d15a4ee74f583f547f Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Oct 14 19:21:44 2024 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Oct 14 19:22:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190736be
sys-libs/ncurses: Add build fix for CHOST ending with gnu*t64 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sys-libs/ncurses/files/ncurses-6.4-t64-1.patch | 12 ++++++++++++ sys-libs/ncurses/files/ncurses-6.4-t64-2.patch | 12 ++++++++++++ sys-libs/ncurses/ncurses-6.4_p20240414.ebuild | 4 ++++ sys-libs/ncurses/ncurses-6.5-r1.ebuild | 4 ++++ sys-libs/ncurses/ncurses-6.5_p20240615.ebuild | 4 ++++ 5 files changed, 36 insertions(+) diff --git a/sys-libs/ncurses/files/ncurses-6.4-t64-1.patch b/sys-libs/ncurses/files/ncurses-6.4-t64-1.patch new file mode 100644 index 000000000000..8df982c371ee --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-6.4-t64-1.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -ruN ncurses-6.4.orig/aclocal.m4 ncurses-6.4/aclocal.m4 +--- ncurses-6.4.orig/aclocal.m4 2024-08-29 20:47:34.978057133 +0000 ++++ ncurses-6.4/aclocal.m4 2024-08-29 20:48:57.809473044 +0000 +@@ -10139,7 +10139,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + CF_GNU_SOURCE($cf_XOPEN_SOURCE) + ;; + (minix*) diff --git a/sys-libs/ncurses/files/ncurses-6.4-t64-2.patch b/sys-libs/ncurses/files/ncurses-6.4-t64-2.patch new file mode 100644 index 000000000000..5abdd5c610de --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-6.4-t64-2.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -ruN ncurses-6.4.orig/configure ncurses-6.4/configure +--- ncurses-6.4.orig/configure 2024-08-29 20:50:18.321117225 +0000 ++++ ncurses-6.4/configure 2024-08-29 20:52:49.308328392 +0000 +@@ -10413,7 +10413,7 @@ + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) ++(linux*gnu*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + + cf_gnu_xopen_source=$cf_XOPEN_SOURCE + diff --git a/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild b/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild index fe3c520b5ff9..bf4152a97a8b 100644 --- a/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild +++ b/sys-libs/ncurses/ncurses-6.4_p20240414.ebuild @@ -178,6 +178,10 @@ PATCHES=( # For the same reasons, please include the original configure.in changes, # NOT just the generated results! "${WORKDIR}"/${GENTOO_PATCH_NAME} + + # Avoid breakage with CHOST ending in t64 + "${FILESDIR}"/ncurses-6.4-t64-1.patch + "${FILESDIR}"/ncurses-6.4-t64-2.patch ) src_unpack() { diff --git a/sys-libs/ncurses/ncurses-6.5-r1.ebuild b/sys-libs/ncurses/ncurses-6.5-r1.ebuild index 4222def62445..3b8b72cdf0f2 100644 --- a/sys-libs/ncurses/ncurses-6.5-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.5-r1.ebuild @@ -115,6 +115,10 @@ PATCHES=( # For the same reasons, please include the original configure.in changes, # NOT just the generated results! "${WORKDIR}"/${GENTOO_PATCH_NAME} + + # Avoid breakage with CHOST ending in t64 + "${FILESDIR}"/ncurses-6.4-t64-1.patch + "${FILESDIR}"/ncurses-6.4-t64-2.patch ) src_unpack() { diff --git a/sys-libs/ncurses/ncurses-6.5_p20240615.ebuild b/sys-libs/ncurses/ncurses-6.5_p20240615.ebuild index a4551c5a8c5c..7057a54fdec3 100644 --- a/sys-libs/ncurses/ncurses-6.5_p20240615.ebuild +++ b/sys-libs/ncurses/ncurses-6.5_p20240615.ebuild @@ -121,6 +121,10 @@ PATCHES=( # For the same reasons, please include the original configure.in changes, # NOT just the generated results! "${WORKDIR}"/${GENTOO_PATCH_NAME} + + # Avoid breakage with CHOST ending in t64 + "${FILESDIR}"/ncurses-6.4-t64-1.patch + "${FILESDIR}"/ncurses-6.4-t64-2.patch ) src_unpack() {