From nobody Thu Jan 04 21:27:07 2024 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 4T5fmq5RSfz55JBB; Thu, 4 Jan 2024 21:27:07 +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 4T5fmq4tlqz4JKg; Thu, 4 Jan 2024 21:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704403627; 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=XUyNX5rvp9OjCzMXJd7H0h2yToz/gPUTuvCMJ5p4LOE=; b=QHTh5K91Mkxgam9A1/tYn4K2y9co+KqRyajni4jF9oyc58+thQpYanEJi99LZU2cZVvmag SFmzAhV+vThjzxT1AEWjYY/6ECGm6mphQzwq+me078+P14HLwOdnogD34vgGQ28qNtbv75 uIue7hj7bBhX3dyttJxhutCG5vZcJ8UcWk9S0UE+g4+7muN/xW6n6cmrucLah3t4n/EgBw AaDJqDl6h2I2EAKnbukdiI4dlmeaiZSmCA6HaxP9qhrui3FxHeduOxPQ6rm03cEmyOAtkI wl+Gw1If3WV0vxcyeErlJHBBUL0qd/JVnTAGmPjZCMirovd4uoH0NieQrCnQQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704403627; 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=XUyNX5rvp9OjCzMXJd7H0h2yToz/gPUTuvCMJ5p4LOE=; b=JjD690fJbaDk7s8Tre3LCezWyJqI+N0buIv0hM/fuRUS0HoXeRTM42XWQ83c0rTRxGDT4w 4ErGBrJicZafxsejqBE63EDF3Vc/cNpItRRfgHTBugFQkaou3vztQyMWPotX9nL3bQUQSK ddyWt20DXIV5mkFyUYAJy0ie+e8LTApkqUdrbYaGrs1BtPcJcTlKmmK3SPNmxjiUZ5bM8l lXfFPK5OXWKnMTAfc10vvJOqPk4S67p6SATp3UpBI5hiaBHfnImYI9VnWp3xkZH1L/4YAV oiWEfJdd5AtsZlV0jERfszLEYF/9JDwZj+efK0jTB6gGTtL54h9R9IzQfJHsUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704403627; a=rsa-sha256; cv=none; b=bhOZUgiwC3KlY+ACnezCeqyaKk/1pni0Fi/1YejMX1JoQssutsVQiC4jGx540ZEOY4YKar skjXXSUR838AHJ1Q5h5EiDm3+hLSuWczQkVNFv5ePld3TlLItkZ8o3VEv+XtPWe+RPqUB2 /r9GFIJkgzDbVPbi5IGoFEakMV0DwQ7iZ4BBmFCGbYyZUb1p3FYPBVjsYI+sepfhjtiz67 Akvhx0BcaCAFkfPYEBijiHX1+3le63+WMS/dTUMQ6AXYoXZMPdlxPFmB4XYNaOAyuKHSBD 9HJTF6Zc/WYAIvJ1f/wtObsNo2ARZysGxI7t5wtDlTd6Tye/OhpyGldf88eDkw== 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 4T5fmq3xVzzV5p; Thu, 4 Jan 2024 21:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 404LR742023413; Thu, 4 Jan 2024 21:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 404LR77m023410; Thu, 4 Jan 2024 21:27:07 GMT (envelope-from git) Date: Thu, 4 Jan 2024 21:27:07 GMT Message-Id: <202401042127.404LR77m023410@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: ad1e41007a66 - main - lang/scm: try unbreaking on the architectures without sbrk(2) 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: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad1e41007a66f02a4bb3f3de46db0bcae7bb1a99 Auto-Submitted: auto-generated The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad1e41007a66f02a4bb3f3de46db0bcae7bb1a99 commit ad1e41007a66f02a4bb3f3de46db0bcae7bb1a99 Author: Mikhail Teterin AuthorDate: 2024-01-04 21:25:26 +0000 Commit: Mikhail Teterin CommitDate: 2024-01-04 21:25:26 +0000 lang/scm: try unbreaking on the architectures without sbrk(2) Upstream's code seems to have special-handling for such platforms. --- lang/scm/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lang/scm/Makefile b/lang/scm/Makefile index fb91abd3116d..528b8d5298ca 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -13,14 +13,11 @@ WWW= https://people.csail.mit.edu/jaffer/SCM LICENSE= LGPL3+ LICENSE_FILES= ${WRKSRC}/COPYING.LESSER -BROKEN_aarch64= fails to link: missing sbrk -BROKEN_riscv64= fails to link: missing sbrk +LIB_DEPENDS= libgnuregex.so:devel/libgnuregex -LIB_DEPENDS= libgnuregex.so.[5-9]:devel/libgnuregex +USES= readline zip WRKSRC= ${WRKDIR}/${PORTNAME} - -USES= readline zip HAS_CONFIGURE= yes CONFIGURE_ENV= --prefix=${PREFIX} MAKE_JOBS_UNSAFE= yes @@ -61,6 +58,10 @@ SCM_MODULES_X11=x.so USES+= compiler:gcc-c++11-lib .endif +.if ${ARCH} == aarch64 || ${ARCH} == riscv64 +CFLAGS+= -DLACK_SBRK +.endif + .include .if ${PORT_OPTIONS:MX11}