From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 030441382C5 for ; Sun, 15 Apr 2018 14:52:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B384E0875; Sun, 15 Apr 2018 14:52:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A2EAE0875 for ; Sun, 15 Apr 2018 14:52:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C23AE335C07 for ; Sun, 15 Apr 2018 14:52:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21DA5257 for ; Sun, 15 Apr 2018 14:52:51 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1523803963.dafbb1556e9b31a848134693e6a59cf41f95887b.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texmacs/files/, app-office/texmacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch app-office/texmacs/texmacs-1.99.6-r2.ebuild X-VCS-Directories: app-office/texmacs/files/ app-office/texmacs/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: dafbb1556e9b31a848134693e6a59cf41f95887b X-VCS-Branch: master Date: Sun, 15 Apr 2018 14:52:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 56451ba6-583c-45ef-82d4-4757a5fffb14 X-Archives-Hash: 1bcfe2d8a73024de9b44fba778acff40 commit: dafbb1556e9b31a848134693e6a59cf41f95887b Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Apr 15 14:52:05 2018 +0000 Commit: Sergei Trofimovich gentoo 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 ++CHECK_CXX_SOURCE_COMPILES( "#include + #include + 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() {