From nobody Fri Jan 05 21:05:04 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 4T6GDx2hyQz55wln; Fri, 5 Jan 2024 21:05:05 +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 4T6GDw6tHRz4Hgh; Fri, 5 Jan 2024 21:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704488705; 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=yI8TQ0srFq9saoujw+u47dpLQCKhtBUR55e0HRfHNJ4=; b=SJABPurixYOuCLPnjGvUC/GGljG1mgi7mSTrCdXqnq9eaYXU3h4IFE11k6NJauPDlyTDOT /My+XXA2Gy9PGcwLLBUpx58xzmzPP7NGor9oBtnKFZUPInZD/Q+Gx9dd07yWHKI6bBdaCd YpO20PvL6Li8GwADP4Ew7wU+LEy0Al15PSLiwxA8dNGAQfWqQGbgy8rFZqWv9X0FAdY80s CD9CsyO1KU88FarN6Nd2+sKYNItIya3yEIHcv6pzIS4ZJmEix6ds5kqBLIyTKod69b4CQ7 +hP8AAlUG+WOVt2P3akkOmgFIwf1XIdEr3lFkPF0UyfeA2SmKQeZbOOp1izDyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704488705; 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=yI8TQ0srFq9saoujw+u47dpLQCKhtBUR55e0HRfHNJ4=; b=ofRouVOE6adAnAzhE4ryq6xZRS+lW8ADDGtCsKwf4zwAccMapqPeA0xVYjXbAokYf+Yg+A O9sTm0gJLQ49PKC9XK89waZdhPyA2JxH2IPxPBdhgBnrXZXe/3v2o2OL9TXXfp42ByR9iP rUIFg6cOSHyXQrAEOTBMKYPXQnEdB5tXCTuu1t4DRui/k3ibkZd/3G/jBx82QXXx82r1y2 E3Gji6Fx3fv4Iuk9BYOlfeqdOQs2Xgj6urn+0nTzZ8VLiZWC+iq+VqgEUYVt3yGod22Y3n Zgypvs7Y+a8aALN30EKUjZTuRAHPSOPLvZi7Uj7WZIOIHhIY9X4btGPwT2WmkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704488705; a=rsa-sha256; cv=none; b=QXrg4SSbSYuyiDCuxJUv0zkSdq2pilZJ/6OrJiA3OTzP+3Mgfn3cnqx6nPKDZgbJudYIdS IU+MzUIC/pYrdDkPG9Xhb4zOE6pdBWJByWLqolo0iRoUlvG5I/Q13Q42L/CkYmNq9BhlUX 9HTljoyktY3t9oQ2kxzd7li2VqPrQrBkZ2SUDb+zWDY5dq263lV5owFmr0tBfJResZ/fdG WWPynMzNdCg8d7mDQG6HH7yjwuddzmhcMEsyElwooHZF4ZorHul9BQUf9YwOzILdp/oV/G A7DlHWlDhXfL3dAhRf6JW2kceSg4WbOVyW1pb4jODM8tx7UkFxLlrplt8tsVBw== 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 4T6GDw5sktz1CkG; Fri, 5 Jan 2024 21:05:04 +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 405L54D1013126; Fri, 5 Jan 2024 21:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405L54Cx013123; Fri, 5 Jan 2024 21:05:04 GMT (envelope-from git) Date: Fri, 5 Jan 2024 21:05:04 GMT Message-Id: <202401052105.405L54Cx013123@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: fa1853a31021 - main - lang/nim: remove ELFv1 support 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: fa1853a31021d6f924dfe1952027e1cdb68977a2 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa1853a31021d6f924dfe1952027e1cdb68977a2 commit fa1853a31021d6f924dfe1952027e1cdb68977a2 Author: Piotr Kubaj AuthorDate: 2024-01-05 19:08:49 +0000 Commit: Piotr Kubaj CommitDate: 2024-01-05 21:04:11 +0000 lang/nim: remove ELFv1 support --- lang/nim/Makefile | 13 ----------- lang/nim/files/elfv1-patch-build.sh | 25 ---------------------- .../files/{clang-patch-build.sh => patch-build.sh} | 0 3 files changed, 38 deletions(-) diff --git a/lang/nim/Makefile b/lang/nim/Makefile index bf2ca8375e75..c4bb97383e8c 100644 --- a/lang/nim/Makefile +++ b/lang/nim/Makefile @@ -31,21 +31,8 @@ TEST_BINARY_ALIAS= node=nodejs TLIST= nimgrep nimpretty nimsuggest testament -.if ${CHOSEN_COMPILER_TYPE} == "gcc" -EXTRA_PATCHES= ${PATCHDIR}/elfv1-patch-build.sh -.else -EXTRA_PATCHES= ${PATCHDIR}/clang-patch-build.sh -.endif - NIMDIR= ${STAGEDIR}${PREFIX}/nim -post-patch: -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1 - @${REINPLACE_CMD} -e '/cc =/s/clang/gcc/' ${WRKSRC}/config/nim.cfg - @${REINPLACE_CMD} -e s/%%GCC_DEFAULT%%/${GCC_DEFAULT}/ \ - ${WRKSRC}/build.sh ${WRKSRC}/config/nim.cfg -.endif - do-build: cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ COMP_FLAGS="${CPPFLAGS} ${CFLAGS}" LINK_FLAGS="${LDFLAGS}" \ diff --git a/lang/nim/files/elfv1-patch-build.sh b/lang/nim/files/elfv1-patch-build.sh deleted file mode 100644 index 556eedaca8e1..000000000000 --- a/lang/nim/files/elfv1-patch-build.sh +++ /dev/null @@ -1,25 +0,0 @@ ---- build.sh.orig 2019-10-24 12:53:39 UTC -+++ build.sh -@@ -84,7 +84,11 @@ - ;; - *freebsd* ) - myos="freebsd" -- CC="clang" -+ if [ "$ucpu" = "powerpc" ] ; then -+ CC="gcc%%GCC_DEFAULT%%" -+ else -+ CC="clang" -+ fi - LINK_FLAGS="$LINK_FLAGS -lm" - ;; - *openbsd* ) ---- config/nim.cfg.orig 2020-09-15 13:59:31 UTC -+++ config/nim.cfg -@@ -9,6 +9,7 @@ - # gcc.path %= "$CC_PATH" - - cc = gcc -+gcc.exe = "gcc%%GCC_DEFAULT%%" - - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors diff --git a/lang/nim/files/clang-patch-build.sh b/lang/nim/files/patch-build.sh similarity index 100% rename from lang/nim/files/clang-patch-build.sh rename to lang/nim/files/patch-build.sh