commit: dafbb1556e9b31a848134693e6a59cf41f95887b Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Apr 15 14:52:05 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Apr 15 14:52:43 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafbb155
app-office/texmacs: fix build failure on 32-bit hosts, bug #652054 C compiler compiles this code for bot int-based and size_t-based guile. C++ compiler does not (and is what used by texmacs). Closes: https://bugs.gentoo.org/652054 Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../texmacs/files/texmacs-1.99.6-guile-size_t.patch | 21 +++++++++++++++++++++ app-office/texmacs/texmacs-1.99.6-r2.ebuild | 3 +++ 2 files changed, 24 insertions(+) diff --git a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch new file mode 100644 index 00000000000..3068169618f --- /dev/null +++ b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch @@ -0,0 +1,21 @@ +C compiler compiles this code for bot int-based and size_t-based +guile. C++ compiler does not (and is what used by texmacs). + +https://bugs.gentoo.org/652054 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 37e9e87..5de2711 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}") + SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS}) + SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES}) + + MESSAGE(STATUS "Checking the size_t of guile strings") + +-CHECK_C_SOURCE_COMPILES( "#include <guile/gh.h> ++CHECK_CXX_SOURCE_COMPILES( "#include <guile/gh.h> + #include <libguile.h> + void print_string (SCM s) { + int len_r; + char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; } + " _guile_str_size_test) diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild index e2d3ac76e18..cdc5bdd2566 100644 --- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild +++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild @@ -51,6 +51,9 @@ PATCHES=( "${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch "${FILESDIR}"/${PN}-1.99.6-math_util.patch + + # fix build failure on 32-bit systems, bug #652054 + "${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch ) src_configure() {
