From nobody Mon Aug 01 21:23:15 2022 X-Original-To: dev-commits-ports-all@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 4LxWLq5Lw6z4Y0QR; Mon, 1 Aug 2022 21:23:15 +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 4LxWLq4xpKz43hh; Mon, 1 Aug 2022 21:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659388995; 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=k4HGougrgA4cdfCSQPw1n0RpXpiqCsGdyDSCJr29aSQ=; b=TgejUbEG08AR7BNjEzlzBLKghZHEWZgTTf93fE+CN2EHEPn/OIZ4R/xgvd0mZbKTC/J0CZ Ju33PCZ2MjV4T7j9Lp3rymUwdBGVb0B9WmyUaFdRwPupRgnD9TGH5/OWbRvqfHZZfyl8ie JVUFefIOxv8mZirGje8LIhp6By3C7vAjOosVho+/QG6bALQ4qFYkh8tPQovfLM0PDQWUnZ pt/FJcDQC+kU8m2/blyL0WOPsEvFK9pmqD9NGc+iE58eSBCp2svOxiAd6SHgBHoVSHmQFB vN4WNVHJ7B1NT+QzEZwSEPdf7rGZB8Ys760edq/6XIEmfgHCg6MAmQNrtOC/ug== 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 4LxWLq43dkznk8; Mon, 1 Aug 2022 21:23:15 +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 271LNFR5007886; Mon, 1 Aug 2022 21:23:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 271LNFtJ007885; Mon, 1 Aug 2022 21:23:15 GMT (envelope-from git) Date: Mon, 1 Aug 2022 21:23:15 GMT Message-Id: <202208012123.271LNFtJ007885@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: 65cfadb92d7b - main - lang/eisl: fix runtime on powerpc64 and build on riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 65cfadb92d7b32aa6c589675803224936d4de397 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659388995; 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=k4HGougrgA4cdfCSQPw1n0RpXpiqCsGdyDSCJr29aSQ=; b=Hi6e8YJ5OoKxmbf714YP35OduxDY3OgCBz3rpDI896xXxLPuIlbKJ4Jk0JPTOw6gOYtzIB K/fwNgKA6JdaZ4yJB2OKiYeR9Z7dUWvo83ss8iSd1RXPhbyFg4EpKMfHERYUv66woagnc0 1UcuEokgBF7I6rlK9ByGqpD2WzKxXYHN9kJxRMv0gDaynUcKhbnD5TZQQgkokcBKh7ByH1 7+ddPYrGGT5s3iMsxTB8AiIs/N3o4ovbjic9KzrsElu7CWI2PHC6LxyFVmop1KEL0qLQw/ Ou7YRWBvzdnbcb1o34gDTEOvYJ4qH5btv/8aWY4cnVSdK8OeivFgw27AvCPRxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659388995; a=rsa-sha256; cv=none; b=cF8N3qdvp712yIB3OLIErDEyklpKK4VESj7hHwNZoHcLuQe1UAYEslH7SqnIy+dFjgqftE /nWEDBVPy6v1Em9XAUE1kUs3uxdxpm+wUr5bVr1DZLGith4nTPXTLS5SwaegvvOsncP3mE ulwZ6+FEmIx2UsxcR7pK11fUwDD27Vf1bxR14W9OBEebuPqtsnkAFtAuSUdyCyh2FQ2f71 lq24YgiI1xaaGFQCz6RCKJzp/DKCB4V9fPyjKXZBz/6s3wA0sNec/i9bFWtbFqS/N77jPz rQZq+p3fDFpNRTeIzGkF7m9gLbl2pC72TsmJODsUZn2+dcac2Zhetfk54aFQ3A== 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=65cfadb92d7b32aa6c589675803224936d4de397 commit 65cfadb92d7b32aa6c589675803224936d4de397 Author: Piotr Kubaj AuthorDate: 2022-08-01 21:19:29 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-01 21:23:07 +0000 lang/eisl: fix runtime on powerpc64 and build on riscv64 1. LTO is known to create broken binaries on powerpc64. 2. LTO causes build failures on riscv64. --- lang/eisl/Makefile | 10 +++++++--- lang/eisl/files/extra-patch-makefile | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/lang/eisl/Makefile b/lang/eisl/Makefile index 480fb19df85e..b95e717195e0 100644 --- a/lang/eisl/Makefile +++ b/lang/eisl/Makefile @@ -1,7 +1,7 @@ PORTNAME= eisl DISTVERSIONPREFIX= v DISTVERSION= 2.50-114 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= -g1216d9e CATEGORIES= lang devel @@ -11,8 +11,6 @@ COMMENT= Interpreter and compiler compatible with ISLisp standard LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/documents/license.txt -BROKEN_riscv64= hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) - TEST_DEPENDS= cppcheck:devel/cppcheck USES= gmake ncurses:port # port because tests need ncurses6-config @@ -30,4 +28,10 @@ LDFLAGS+= -lncursesw PLIST_FILES= bin/edlis \ bin/eisl +.include + +.if ${ARCH} == powerpc64 || ${ARCH} == riscv64 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-makefile +.endif + .include diff --git a/lang/eisl/files/extra-patch-makefile b/lang/eisl/files/extra-patch-makefile new file mode 100644 index 000000000000..1a520e96a594 --- /dev/null +++ b/lang/eisl/files/extra-patch-makefile @@ -0,0 +1,19 @@ +--- makefile.orig 2022-08-01 14:01:09 UTC ++++ makefile +@@ -42,7 +42,7 @@ ifeq ($(DEBUG),1) + LDFLAGS := -fsanitize=undefined + endif + else +- CFLAGS += -O3 -flto -DNDEBUG=1 -DWITHOUT_NANA=1 ++ CFLAGS += -O3 -DNDEBUG=1 -DWITHOUT_NANA=1 + SRC_CII += cii/src/mem.c + endif + OBJ_CII := $(SRC_CII:.c=.o) +@@ -59,7 +59,6 @@ ifeq ($(shell uname -n),raspberrypi) + CFLAGS += -D__rpi__ + endif + ifneq ($(DEBUG),1) +- LDFLAGS += -flto + ifeq ($(OPSYS),macos) + LDFLAGS += -Wl,-S,-x + else