commit: f553b896d25848f8924ae58b456ede494f8503e3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 6 03:37:24 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 6 03:49:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f553b896
dev-db/libodbc++: fix build w/ musl 1.2.3 (and possibly libcxx?) Closes: https://bugs.gentoo.org/855887 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libodbc++-0.2.3-musl-1.2.3-null.patch | 16 ++++++++++++++++ dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-musl-1.2.3-null.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-musl-1.2.3-null.patch new file mode 100644 index 000000000000..f7d5a2e3436f --- /dev/null +++ b/dev-db/libodbc++/files/libodbc++-0.2.3-musl-1.2.3-null.patch @@ -0,0 +1,16 @@ +https://cgit.freebsd.org/ports/tree/databases/libodbc++/files/patch-src-datetime.cpp +https://bugs.gentoo.org/855887 + +(Given the source, possibly fixes libcxx too?) +--- a/src/datetime.cpp ++++ b/src/datetime.cpp +@@ -272,7 +272,7 @@ + # endif + #endif + ,ODBCXX_STRING_CONST("%09d"),nanos_); +- buf[9] = NULL;// Terminate string ++ buf[9] = '\0';// Terminate string + ret+=ODBCXX_STRING(buf); + } + return ret; + diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild index 3241509b98af..b3ebd27f321a 100644 --- a/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild +++ b/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,6 +27,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.2.3-doxygen.patch "${FILESDIR}"/${PN}-0.2.3-gcc41.patch "${FILESDIR}"/${PN}-0.2.3-gcc44.patch + "${FILESDIR}"/${PN}-0.2.3-musl-1.2.3-null.patch ) src_prepare() {
