From nobody Thu Feb 03 13:45:55 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E283F198C37F; Thu, 3 Feb 2022 13:45:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JqKgm2stPz4hMw; Thu, 3 Feb 2022 13:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643895956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGVKIT+WFBqxQtYvjfXT0K6X1x2D6oXI+/voWCSCO9Y=; b=V5hASkR4hffEfHFvHtUVjmYdfC3cHmBc5GaIYMufn7kmUijj+e1k53EEIZups5C+Jq0d6P 3VbrlWOWHnqwWJ0UXZSbpw82/+JpEZhH82FnxNRVe56u6dg2LP4vOrzhIvo06bHF2IGIKx 3Im/EfnFrJi3a9AusPLAfubO5N5j61fKYaiAWpRh9vKMihaLxJQdD3OjYbRjb4mxushyJC sjn/St+rHbwofOHPmYh5pUP0MVGWnk2WZ2+T5fX8E0450E2qHNhBfDSyQvP78qLMO0zxkq 4cpeUDb8acpYN+g23UH52F4MOLNgEv7noH6luxDweNKBtbpABsF2V8MPWOoV7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CDA0018FBA; Thu, 3 Feb 2022 13:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 213Djt26068540; Thu, 3 Feb 2022 13:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 213DjtCM068539; Thu, 3 Feb 2022 13:45:55 GMT (envelope-from git) Date: Thu, 3 Feb 2022 13:45:55 GMT Message-Id: <202202031345.213DjtCM068539@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 6edecd95cb41 - main - lang/guile: fix build on powerpc List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6edecd95cb410b25f9f1b3d408e92fac57508be7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643895956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGVKIT+WFBqxQtYvjfXT0K6X1x2D6oXI+/voWCSCO9Y=; b=WZ8SXDA09leTeO2czHXU+HPyCijkxKjNIGjprKmEifdqhgvWDben6y8/ahBKlkVOr6Mfb8 b2R7N8/igq79EvVWjn1/PDWlCnPtfXM9V6mNrjay+eP+rLuCycuyS0Wf6dGE8mNFnoXO25 Nmx+qYG74B8AMWiOI24CVALI3wZ42nLiVtPT8gMX65hgKyXESg/oD5a9tSMEEVrGoqWogU wE+yNwiW+HOg2JiU1c6EntWzOYGldDMZl4i4eDfCtazWLbBL8tW2vjw9QeCsdEvOU6jvJa p29c/dZ248HDtj3HfbRJLZqjlkJp6abxd8kL6vdz61Ui5dUKZyxa0CD+9FTRhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643895956; a=rsa-sha256; cv=none; b=gTGaoG8sAs43DGHn3jS6OV9wwWDbXbfz0hm1Hm0TTfZ6TcG2PS48TP5iBh0N5ZoREIh5sl cDz70e0Bobgq16G+IipX5W+8nGQSIYvvt6//oVWJ7Na3qmoQ6p7UqxViex1XqrJhc+4bUf BfVzngnVb949uUzqbxCr8lBnE4HZFEIh8YRG5aeOUJ6xwilNqA85rvu8ixsijpQr54qGID 8p/n12MpUBZ1ANofF4oxXySY30WNhaB4wZemKP0JIjANrjLoBgPnQT83DoKoxZI66Qp+5i 96GY8cjHVpi2mg5SzGqL5i5otNy77aDfK3KJKt69g5eGlM1VQRLmzsrAepuEEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=6edecd95cb410b25f9f1b3d408e92fac57508be7 commit 6edecd95cb410b25f9f1b3d408e92fac57508be7 Author: Piotr Kubaj AuthorDate: 2022-02-03 13:39:44 +0000 Commit: Piotr Kubaj CommitDate: 2022-02-03 13:39:44 +0000 lang/guile: fix build on powerpc 1. Same as with guile2, remove the broken 32-bit big-endian bootstrap. 2. As reported in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214, add "-Oresolve-primitives -Ocps" to GUILE_OPTIMIZATIONS. --- lang/guile/Makefile | 7 +++++++ lang/guile/files/extra-patch-bootstrap_Makefile.in | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 85ba27157bca..fbe30cd86534 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -45,11 +45,18 @@ THREADS_CONFIGURE_WITH= threads THREADS_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded THREADS_LIB_DEPENDS_OFF= libgc.so:devel/boehm-gc +.include + +.if ${ARCH} == powerpc +EXTRA_PATCHES= ${FILESDIR}/extra-patch-bootstrap_Makefile.in +.endif + post-patch: @${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-i -e|-i.bak -e|' \ ${WRKSRC}/libguile/Makefile.in + @${RM} -r ${WRKSRC}/prebuilt/32-bit-big-endian post-patch-THREADS-on: @${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure diff --git a/lang/guile/files/extra-patch-bootstrap_Makefile.in b/lang/guile/files/extra-patch-bootstrap_Makefile.in new file mode 100644 index 000000000000..b5c56900c963 --- /dev/null +++ b/lang/guile/files/extra-patch-bootstrap_Makefile.in @@ -0,0 +1,11 @@ +--- bootstrap/Makefile.in.orig 2022-02-02 15:41:58 UTC ++++ bootstrap/Makefile.in +@@ -1751,7 +1751,7 @@ top_builddir_absolute = @top_builddir_absolute@ + top_srcdir = @top_srcdir@ + top_srcdir_absolute = @top_srcdir_absolute@ + GUILE_WARNINGS = -W0 +-GUILE_OPTIMIZATIONS = -O1 ++GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps + GOBJECTS = $(SOURCES:%.scm=%.go) + nobase_noinst_DATA = $(GOBJECTS) + CLEANFILES = $(GOBJECTS)