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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31287158094 for ; Sun, 28 Aug 2022 12:56:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 432D7E092B; Sun, 28 Aug 2022 12:56:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F88EE092B for ; Sun, 28 Aug 2022 12:56:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E36C4340DB8 for ; Sun, 28 Aug 2022 12:56:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42BC9574 for ; Sun, 28 Aug 2022 12:56:16 +0000 (UTC) From: "Rui Huang" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rui Huang" Message-ID: <1661691359.45b1495d7da1662179260b7a5aefbfb934c7ee7c.vowstar@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/bluespec/files/, sci-electronics/bluespec/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-electronics/bluespec/Manifest sci-electronics/bluespec/bluespec-0_pre20210124.ebuild sci-electronics/bluespec/bluespec-2022.01.ebuild sci-electronics/bluespec/bluespec-9999.ebuild sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-libdir.patch sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-wrapper.patch sci-electronics/bluespec/files/bluespec-2022.01-libstp-stub-makefile.patch sci-electronics/bluespec/metadata.xml X-VCS-Directories: sci-electronics/bluespec/files/ sci-electronics/bluespec/ X-VCS-Committer: vowstar X-VCS-Committer-Name: Rui Huang X-VCS-Revision: 45b1495d7da1662179260b7a5aefbfb934c7ee7c X-VCS-Branch: dev Date: Sun, 28 Aug 2022 12:56:16 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 93f1e6c6-0191-465f-bafc-a7491aa5e5f4 X-Archives-Hash: 05106a3f3b2a8682d60e7086f6ac6e67 commit: 45b1495d7da1662179260b7a5aefbfb934c7ee7c Author: Huang Rui gmail com> AuthorDate: Sun Aug 28 12:55:59 2022 +0000 Commit: Rui Huang gmail com> CommitDate: Sun Aug 28 12:55:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=45b1495d sci-electronics/bluespec: bump to 2022.01 Signed-off-by: Huang Rui gmail.com> sci-electronics/bluespec/Manifest | 2 + .../bluespec/bluespec-0_pre20210124.ebuild | 70 ------ sci-electronics/bluespec/bluespec-2022.01.ebuild | 114 ++++++++++ sci-electronics/bluespec/bluespec-9999.ebuild | 88 ++++++-- .../files/bluespec-0_pre20210106-fix-libdir.patch | 250 --------------------- .../files/bluespec-0_pre20210106-fix-wrapper.patch | 13 -- .../bluespec-2022.01-libstp-stub-makefile.patch | 38 ++++ sci-electronics/bluespec/metadata.xml | 8 +- 8 files changed, 224 insertions(+), 359 deletions(-) diff --git a/sci-electronics/bluespec/Manifest b/sci-electronics/bluespec/Manifest new file mode 100644 index 000000000..7849b0d80 --- /dev/null +++ b/sci-electronics/bluespec/Manifest @@ -0,0 +1,2 @@ +DIST bluespec-2022.01.tar.gz 25576850 BLAKE2B c80dada5bdbc13bd8ff4205ff8b65384845548b61190dd0d3729d877be576b78acfd38857adf427321f9ba078bae2891640cf211e907ca2db679bd7a0d2bb536 SHA512 e6a1e0197d42ca402180735d1f2c41ab84b47eb8708d4ff49a9d509a928dec7cda88d06353faaebefcabacb734d6f7dd1cee1b6e1053010231c8ae508cb80789 +DIST yices-2.6.4.tar.gz 10186909 BLAKE2B 1c4b6297fd59924e9d99b9e17eb4b42e9bfbc24dcd56631beb9b72103c91578eb72b90cb9e228a5e9d489efc520a2e1d41185e9c3f4a8c43fc93f8dabba7414d SHA512 d8102c41fda0e200fd1336ae317b516d2797d10c187b8f7aecf0c9b08b4b487b90bef8c358099b2da51c0367326939f9610fd4e6d5a41a392cf1114bd04b8763 diff --git a/sci-electronics/bluespec/bluespec-0_pre20210124.ebuild b/sci-electronics/bluespec/bluespec-0_pre20210124.ebuild deleted file mode 100644 index bff19b5f4..000000000 --- a/sci-electronics/bluespec/bluespec-0_pre20210124.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Bluespec high level hardware design language compiler" -HOMEPAGE="https://github.com/B-Lang-org/bsc" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/B-Lang-org/bsc.git" - inherit git-r3 -else - EGIT_COMMIT="69dee0667e51108832b685511e9aa631cca1e83a" - # Using SRC_URI here will failed because this repo uses git submodules. - # SRC_URI="https://github.com/B-Lang-org/bsc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - # S="${WORKDIR}/bsc-${EGIT_COMMIT}" - # Waiting for https://github.com/B-Lang-org/bsc/issues/85 - EGIT_REPO_URI="https://github.com/B-Lang-org/bsc.git" - # This inherit git-r3 will removed after upstream finished. - inherit git-r3 - - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="BSD GPL-3+ MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-haskell/old-time:0= - dev-haskell/regex-compat:0= - dev-haskell/split:0= - dev-haskell/syb:0= - dev-lang/tcl -" - -DEPEND=" - ${RDEPEND} - test? ( - dev-util/dejagnu - sci-electronics/systemc - sys-process/time - ) -" - -BDEPEND=" - dev-haskell/cabal:0= - dev-lang/ghc:0= - dev-util/gperf - sys-devel/autoconf - sys-devel/bison - sys-devel/flex -" - -PATCHES=( - "${FILESDIR}"/${PN}-0_pre20210106-fix-libdir.patch - "${FILESDIR}"/${PN}-0_pre20210106-fix-wrapper.patch -) - -DOCS=( "README.md" "COPYING" ) - -# We don't want to run it because it will do install by default. -src_compile() { :; } - -src_install() { - emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install - emake -C src/comp PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install-extra - einstalldocs -} diff --git a/sci-electronics/bluespec/bluespec-2022.01.ebuild b/sci-electronics/bluespec/bluespec-2022.01.ebuild new file mode 100644 index 000000000..b16ee8ddb --- /dev/null +++ b/sci-electronics/bluespec/bluespec-2022.01.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Toolchain for the Bluespec Hardware Definition Language" +HOMEPAGE="https://github.com/B-Lang-org/bsc" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/B-Lang-org/bsc.git" + inherit git-r3 +else + SRC_URI=" + https://github.com/B-Lang-org/bsc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/SRI-CSL/yices2/archive/refs/tags/Yices-2.6.4.tar.gz -> yices-2.6.4.tar.gz + " + S="${WORKDIR}/bsc-${PV}" + S_YICES="${WORKDIR}/yices2-Yices-2.6.4" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD GPL-3+ MIT" +SLOT="${PV}" +IUSE="doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-haskell/old-time:0= + dev-haskell/regex-compat:0= + dev-haskell/split:0= + dev-haskell/syb:0= + dev-lang/tcl +" + +DEPEND=" + ${RDEPEND} + test? ( + dev-util/dejagnu + sci-electronics/iverilog + sci-electronics/systemc + sys-process/time + ) +" + +BDEPEND=" + dev-haskell/cabal:0= + dev-lang/ghc:0= + dev-lang/perl + dev-util/gperf + doc? ( + dev-ruby/asciidoctor + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-plaingeneric + ) + sys-devel/autoconf + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-2022.01-libstp-stub-makefile.patch +) + +DOCS=( "README.md" "COPYING" ) + +src_prepare() { + if [[ ${PV} != "9999" ]] ; then + rm -r "${S}"/src/vendor/yices/v2.6/yices2 || die + ln -s "${S_YICES}" "${S}"/src/vendor/yices/v2.6/yices2 || die + fi + + default +} + +src_compile() { + # NO_DEPS_CHECKS=1: skip the subrepo check (this deriviation uses yices.src instead of the subrepo) + # NOGIT=1: https://github.com/B-Lang-org/bsc/issues/12 + # LDCONFIG=ldconfig: https://github.com/B-Lang-org/bsc/pull/43 + # STP_STUB=1: https://github.com/B-Lang-org/bsc/pull/278 + emake \ + "NO_DEPS_CHECKS=1" \ + "NOGIT=1" \ + "LDCONFIG=ldconfig" \ + "STP_STUB=1" \ + $(usex doc "" "NOASCIIDOCTOR=1") \ + $(usex doc "install-doc" "") \ + $(usex doc "install-release" "") \ + install-src \ + $(usex doc "release" "") + emake -C src/comp \ + install-extra +} + +src_test() { + emake check-smoke + emake -c testsuite check +} + +src_install() { + # From https://github.com/B-Lang-org/bsc/blob/main/INSTALL.md, + # upstream recommend placing the inst directory at + # the path /usr/share/bsc/bsc- for multi-version. + local PREFIX="${ED}"/usr/share/bsc/bsc-"${PV}" + mkdir -p "${PREFIX}" || die + cp -dr --preserve=mode,timestamp "${S}"/inst/* "${PREFIX}"/ || die + insinto "${PREFIX}"/vimfiles + doins -r "${S}"/util/vim/{ftdetect,indent,syntax} +} diff --git a/sci-electronics/bluespec/bluespec-9999.ebuild b/sci-electronics/bluespec/bluespec-9999.ebuild index 5769c1fbc..b16ee8ddb 100644 --- a/sci-electronics/bluespec/bluespec-9999.ebuild +++ b/sci-electronics/bluespec/bluespec-9999.ebuild @@ -1,30 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -DESCRIPTION="Bluespec high level hardware design language compiler" +DESCRIPTION="Toolchain for the Bluespec Hardware Definition Language" HOMEPAGE="https://github.com/B-Lang-org/bsc" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git" + EGIT_REPO_URI="https://github.com/B-Lang-org/bsc.git" inherit git-r3 else - EGIT_COMMIT="69dee0667e51108832b685511e9aa631cca1e83a" - # Using SRC_URI here will failed because this repo uses git submodules. - # SRC_URI="https://github.com/B-Lang-org/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - # S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - # Waiting for https://github.com/B-Lang-org/bsc/issues/85 - EGIT_REPO_URI="https://github.com/B-Lang-org/${PN}.git" - # This inherit git-r3 will removed after upstream finished. - inherit git-r3 - + SRC_URI=" + https://github.com/B-Lang-org/bsc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/SRI-CSL/yices2/archive/refs/tags/Yices-2.6.4.tar.gz -> yices-2.6.4.tar.gz + " + S="${WORKDIR}/bsc-${PV}" + S_YICES="${WORKDIR}/yices2-Yices-2.6.4" KEYWORDS="~amd64 ~x86" fi LICENSE="BSD GPL-3+ MIT" -SLOT="0" -IUSE="test" +SLOT="${PV}" +IUSE="doc test" RESTRICT="!test? ( test )" RDEPEND=" @@ -39,6 +36,7 @@ DEPEND=" ${RDEPEND} test? ( dev-util/dejagnu + sci-electronics/iverilog sci-electronics/systemc sys-process/time ) @@ -47,24 +45,70 @@ DEPEND=" BDEPEND=" dev-haskell/cabal:0= dev-lang/ghc:0= + dev-lang/perl dev-util/gperf + doc? ( + dev-ruby/asciidoctor + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-plaingeneric + ) sys-devel/autoconf sys-devel/bison sys-devel/flex + virtual/pkgconfig " PATCHES=( - "${FILESDIR}"/${PN}-0_pre20210106-fix-libdir.patch - "${FILESDIR}"/${PN}-0_pre20210106-fix-wrapper.patch + "${FILESDIR}"/${PN}-2022.01-libstp-stub-makefile.patch ) DOCS=( "README.md" "COPYING" ) -# We don't want to run it because it will do install by default. -src_compile() { :; } +src_prepare() { + if [[ ${PV} != "9999" ]] ; then + rm -r "${S}"/src/vendor/yices/v2.6/yices2 || die + ln -s "${S_YICES}" "${S}"/src/vendor/yices/v2.6/yices2 || die + fi + + default +} + +src_compile() { + # NO_DEPS_CHECKS=1: skip the subrepo check (this deriviation uses yices.src instead of the subrepo) + # NOGIT=1: https://github.com/B-Lang-org/bsc/issues/12 + # LDCONFIG=ldconfig: https://github.com/B-Lang-org/bsc/pull/43 + # STP_STUB=1: https://github.com/B-Lang-org/bsc/pull/278 + emake \ + "NO_DEPS_CHECKS=1" \ + "NOGIT=1" \ + "LDCONFIG=ldconfig" \ + "STP_STUB=1" \ + $(usex doc "" "NOASCIIDOCTOR=1") \ + $(usex doc "install-doc" "") \ + $(usex doc "install-release" "") \ + install-src \ + $(usex doc "release" "") + emake -C src/comp \ + install-extra +} + +src_test() { + emake check-smoke + emake -c testsuite check +} src_install() { - emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install - emake -C src/comp PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install-extra - einstalldocs + # From https://github.com/B-Lang-org/bsc/blob/main/INSTALL.md, + # upstream recommend placing the inst directory at + # the path /usr/share/bsc/bsc- for multi-version. + local PREFIX="${ED}"/usr/share/bsc/bsc-"${PV}" + mkdir -p "${PREFIX}" || die + cp -dr --preserve=mode,timestamp "${S}"/inst/* "${PREFIX}"/ || die + insinto "${PREFIX}"/vimfiles + doins -r "${S}"/util/vim/{ftdetect,indent,syntax} } diff --git a/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-libdir.patch b/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-libdir.patch deleted file mode 100644 index e0afdb4c5..000000000 --- a/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-libdir.patch +++ /dev/null @@ -1,250 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4938b24..51e265b 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,6 +3,7 @@ TOP := $(PWD) - - PREFIX ?= $(TOP)/inst - BUILDDIR ?= $(TOP)/build -+LIBDIR ?= $(PREFIX)/lib - - .PHONY: all - all: install -@@ -21,7 +22,7 @@ rem_build: - - .PHONY: install - install: -- $(MAKE) -C src PREFIX=$(PREFIX) install -+ $(MAKE) -C src PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) install - - # In the future, this will be much more expansive, and run the actual test - # suite once it's open sourced. -diff --git a/src/Makefile b/src/Makefile -index 1daeb3a..b5a1146 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -4,6 +4,7 @@ TOP := $(PWD)/.. - include $(TOP)/platform.mk - - PREFIX?=$(TOP)/inst -+LIBDIR?=$(PREFIX)/lib - - ifndef NO_DEPS_CHECKS - CC_TOOLS=$(CC) $(CXX) $(LD) -@@ -45,17 +46,17 @@ all: install - - .PHONY: install clean full_clean - install clean full_clean: -- $(MAKE) -C vendor/stp PREFIX=$(PREFIX) $@ -- $(MAKE) -C vendor/yices PREFIX=$(PREFIX) $@ -- $(MAKE) -C vendor/htcl PREFIX=$(PREFIX) $@ -+ $(MAKE) -C vendor/stp PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C vendor/yices PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C vendor/htcl PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ - # we need to build targets from here sequentially, as they operate in the same workspace -- $(MAKE) -C comp -j1 PREFIX=$(PREFIX) $@ -- $(MAKE) -C Libraries PREFIX=$(PREFIX) $@ -- $(MAKE) -C exec PREFIX=$(PREFIX) $@ -- $(MAKE) -C VPI PREFIX=$(PREFIX) $@ -- $(MAKE) -C Verilog PREFIX=$(PREFIX) $@ -- $(MAKE) -C Verilog.Quartus PREFIX=$(PREFIX) $@ -- $(MAKE) -C Verilog.Vivado PREFIX=$(PREFIX) $@ -- $(MAKE) -C bluetcl PREFIX=$(PREFIX) $@ -- $(MAKE) -C bluesim PREFIX=$(PREFIX) $@ -+ $(MAKE) -C comp -j1 PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C Libraries PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C exec PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C VPI PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C Verilog PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C Verilog.Quartus PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C Verilog.Vivado PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C bluetcl PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ -+ $(MAKE) -C bluesim PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@ - -diff --git a/src/VPI/Makefile b/src/VPI/Makefile -index 698037b..0070714 100644 ---- a/src/VPI/Makefile -+++ b/src/VPI/Makefile -@@ -6,7 +6,8 @@ include $(TOP)/platform.mk - INSTALL ?= install - - PREFIX?=$(TOP)/inst --INSTALLDIR=$(PREFIX)/lib/VPI -+LIBDIR?=$(PREFIX)/lib -+INSTALLDIR=$(LIBDIR)/VPI - - .PHONY: all - all: install -diff --git a/src/Verilog/common.mk b/src/Verilog/common.mk -index ef29190..06b3553 100644 ---- a/src/Verilog/common.mk -+++ b/src/Verilog/common.mk -@@ -14,7 +14,8 @@ INSTALL?=install -c - RM = rm -f - - PREFIX?=$(TOP)/inst --INSTALLDIR=$(PREFIX)/lib/$(INSTALL_NAME) -+LIBDIR?=$(PREFIX)/lib -+INSTALLDIR=$(LIBDIR)/$(INSTALL_NAME) - - .PHONY: all - all: test -diff --git a/src/bluesim/Makefile b/src/bluesim/Makefile -index 60f2fd9..3e66e5a 100644 ---- a/src/bluesim/Makefile -+++ b/src/bluesim/Makefile -@@ -4,7 +4,8 @@ TOP:=$(PWD)/../.. - INSTALL ?= install - - PREFIX?=$(TOP)/inst --INSTALLDIR=$(PREFIX)/lib/Bluesim -+LIBDIR?=$(PREFIX)/lib -+INSTALLDIR=$(LIBDIR)/Bluesim - - COMPDIR=$(TOP)/src/comp - -diff --git a/src/bluetcl/Makefile b/src/bluetcl/Makefile -index 80d6050..34d877b 100644 ---- a/src/bluetcl/Makefile -+++ b/src/bluetcl/Makefile -@@ -2,7 +2,8 @@ PWD:=$(shell pwd) - TOP:=$(PWD)/../.. - - PREFIX?=$(TOP)/inst --INSTALLDIR = $(PREFIX)/lib/tcllib/bluespec -+LIBDIR?=$(PREFIX)/lib -+INSTALLDIR = $(LIBDIR)/tcllib/bluespec - - FILES = \ - tclIndex \ -diff --git a/src/bluetcl/bluespec.tcl b/src/bluetcl/bluespec.tcl -index 4ee8e86..e243531 100644 ---- a/src/bluetcl/bluespec.tcl -+++ b/src/bluetcl/bluespec.tcl -@@ -129,6 +129,7 @@ proc Bluetcl::initBluespec {} { - utils::donothing - lappend auto_path /usr/share - lappend auto_path /usr/lib -+lappend auto_path /usr/lib64 - - if { [catch Bluetcl::initBluespec err] } { - puts "Error in initialization file bluespec.tcl: $err" -diff --git a/src/comp/Makefile b/src/comp/Makefile -index 58b81d7..6f113a2 100644 ---- a/src/comp/Makefile -+++ b/src/comp/Makefile -@@ -14,6 +14,7 @@ RM = rm -f - LN = ln -sf - - FIND = find -+SED = sed - - # ----- - # Options -@@ -37,6 +38,7 @@ export NOUPDATEBUILDVERSION - - # PREFIX is where things are installed - PREFIX?=$(TOP)/inst -+LIBDIR=$(PREFIX)/lib - BINDIR=$(PREFIX)/bin - - # Top-level of where intermediate GHC files are stored -@@ -389,7 +391,8 @@ $(BINDIR)/core/%: % - - $(BINDIR)/%: wrapper.sh $(BINDIR)/core/% - mkdir -p -m 755 $(BINDIR) -- $(INSTALL) -m 755 wrapper.sh $(BINDIR)/$(@F) -+ $(SED) "s:^LIBDIR=.*$$:LIBDIR=\"$(abspath $(LIBDIR))\":g" wrapper.sh > $(BUILDDIR)/$(@F) -+ $(INSTALL) -m 755 $(BUILDDIR)/$(@F) $(BINDIR)/$(@F) - - .PHONY: install-bsc - install-bsc: $(addprefix $(BINDIR)/,$(BSCEXES)) -diff --git a/src/comp/wrapper.sh b/src/comp/wrapper.sh -index 656e9a0..1d5cf47 100755 ---- a/src/comp/wrapper.sh -+++ b/src/comp/wrapper.sh -@@ -5,9 +5,23 @@ - ABSNAME="$(cd "${0%/*}"; echo $PWD)/${0##*/}" - SCRIPTNAME="${ABSNAME##*/}" - BINDIR="${ABSNAME%/*}" -+# LIBDIR will be replaced to user defined path after build -+LIBDIR="${BINDIR}/../lib" -+ -+# If missing LIBDIR, search one. -+# This is unlikely to happen unless the user moves the file after installation. -+if [ ! -d ${LIBDIR} ]; then -+ LIBDIR="$(find ${BINDIR}/.. -maxdepth 10 -type d -name 'SAT' -print -quit)" -+ if [ ! "x${LIBDIR}" = "x" ]; then -+ LIBDIR="${LIBDIR}/.." -+ else -+ echo "Error Bluespec library path not found." -+ exit 1; -+ fi -+fi - - # Set BLUESPECDIR based on the location --BLUESPECDIR="$(cd ${BINDIR}/../lib; echo $PWD)" -+BLUESPECDIR="$(cd ${LIBDIR}; echo $PWD)" - export BLUESPECDIR - - # Add the dynamically-linked SAT libraries to the load path -diff --git a/src/exec/Makefile b/src/exec/Makefile -index 9a16e22..02536cc 100644 ---- a/src/exec/Makefile -+++ b/src/exec/Makefile -@@ -4,7 +4,8 @@ TOP:=$(PWD)/../.. - INSTALL?= install - - PREFIX?=$(TOP)/inst --INSTALLDIR=$(PREFIX)/lib/exec -+LIBDIR?=$(PREFIX)/lib -+INSTALLDIR=$(LIBDIR)/exec - - .PHONY: install - install: -diff --git a/src/vendor/stp/Makefile b/src/vendor/stp/Makefile -index 092995d..a520184 100644 ---- a/src/vendor/stp/Makefile -+++ b/src/vendor/stp/Makefile -@@ -2,6 +2,7 @@ TOP=../../.. - include $(TOP)/platform.mk - - PREFIX?=$(TOP)/inst -+LIBDIR?=$(PREFIX)/lib - - .PHONY: all install clean full_clean - -@@ -22,8 +23,8 @@ all: install - install: - $(MAKE) -C $(SRC) install - ln -fsn HaskellIfc include_hs -- install -m 755 -d $(PREFIX)/lib/SAT -- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT -+ install -m 755 -d $(LIBDIR)/SAT -+ install -m 644 lib/$(SNAME) $(LIBDIR)/SAT - - clean: - $(MAKE) -C $(SRC) clean -diff --git a/src/vendor/yices/Makefile b/src/vendor/yices/Makefile -index b8dbdea..8d4776c 100644 ---- a/src/vendor/yices/Makefile -+++ b/src/vendor/yices/Makefile -@@ -2,6 +2,7 @@ TOP:=../../.. - include $(TOP)/platform.mk - - PREFIX?=$(TOP)/inst -+LIBDIR?=$(PREFIX)/lib - - .PHONY: all clean full_clean install - -@@ -22,8 +23,8 @@ install: - ln -fsn $(VERSION)/include - ln -fsn $(VERSION)/lib - ln -fsn $(VERSION)/include_hs -- install -m 755 -d $(PREFIX)/lib/SAT -- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT -+ install -m 755 -d $(LIBDIR)/SAT -+ install -m 644 lib/$(SNAME) $(LIBDIR)/SAT - - clean: - $(MAKE) -C $(VERSION) clean diff --git a/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-wrapper.patch b/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-wrapper.patch deleted file mode 100644 index 974e42894..000000000 --- a/sci-electronics/bluespec/files/bluespec-0_pre20210106-fix-wrapper.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/comp/Makefile b/src/comp/Makefile -index 6f113a2..5220c30 100644 ---- a/src/comp/Makefile -+++ b/src/comp/Makefile -@@ -391,7 +391,7 @@ $(BINDIR)/core/%: % - - $(BINDIR)/%: wrapper.sh $(BINDIR)/core/% - mkdir -p -m 755 $(BINDIR) -- $(SED) "s:^LIBDIR=.*$$:LIBDIR=\"$(abspath $(LIBDIR))\":g" wrapper.sh > $(BUILDDIR)/$(@F) -+ $(SED) "s:^LIBDIR=.*$$:LIBDIR=\"$$\{BINDIR\}/$(shell realpath --relative-to $(BINDIR) $(LIBDIR))\":g" wrapper.sh > $(BUILDDIR)/$(@F) - $(INSTALL) -m 755 $(BUILDDIR)/$(@F) $(BINDIR)/$(@F) - - .PHONY: install-bsc diff --git a/sci-electronics/bluespec/files/bluespec-2022.01-libstp-stub-makefile.patch b/sci-electronics/bluespec/files/bluespec-2022.01-libstp-stub-makefile.patch new file mode 100644 index 000000000..be4c0b55c --- /dev/null +++ b/sci-electronics/bluespec/files/bluespec-2022.01-libstp-stub-makefile.patch @@ -0,0 +1,38 @@ +From 1981ce3eb76c1a3fe977728959bde823156b8055 Mon Sep 17 00:00:00 2001 +From: Jack Cummings +Date: Thu, 12 Nov 2020 22:16:11 -0800 +Subject: [PATCH] tweak to b37ad3c; install libstp_stub.so when STP_STUB=1 + +--- + src/vendor/stp/Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/vendor/stp/Makefile b/src/vendor/stp/Makefile +index 092995d7f..c1bbc2019 100644 +--- a/src/vendor/stp/Makefile ++++ b/src/vendor/stp/Makefile +@@ -9,12 +9,13 @@ ifeq ($(STP_STUB),) + SRC = src + else + SRC = src_stub ++SNAME += lib/libstp_stub.so + endif + + ifeq ($(OSTYPE), Darwin) +-SNAME=libstp.dylib ++SNAME = lib/libstp.dylib + else +-SNAME=libstp.so.1 ++SNAME += lib/libstp.so.1 + endif + + all: install +@@ -23,7 +24,7 @@ install: + $(MAKE) -C $(SRC) install + ln -fsn HaskellIfc include_hs + install -m 755 -d $(PREFIX)/lib/SAT +- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT ++ install -m 644 $(SNAME) $(PREFIX)/lib/SAT + + clean: + $(MAKE) -C $(SRC) clean diff --git a/sci-electronics/bluespec/metadata.xml b/sci-electronics/bluespec/metadata.xml index 27738d5e2..1994a0713 100644 --- a/sci-electronics/bluespec/metadata.xml +++ b/sci-electronics/bluespec/metadata.xml @@ -9,9 +9,9 @@ B-Lang-org/bsc - This is a compiler, simulator, and associated tools for Bluespec High Level - Hardware Design Language (HL-HDL), supporting the two optional syntaxes, - BSV and BH. Language specifications and tutorials are available in the - BSVlang repository. + This is a compiler, simulator, and associated tools for Bluespec High Level + Hardware Design Language (HL-HDL), supporting the two optional syntaxes, + BSV and BH. Language specifications and tutorials are available in the + BSVlang repository.