Page MenuHomeFreeBSD
Files F159263089

D55356.id172181.diff
No OneTemporary
Actions

D55356.id172181.diff
View Options

diff --git a/emulators/rvvm/Makefile b/emulators/rvvm/Makefile
--- a/emulators/rvvm/Makefile
+++ b/emulators/rvvm/Makefile
@@ -1,11 +1,9 @@
PORTNAME= RVVM
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.6
+PORTEPOCH= 1
+DISTVERSION= g20260217
CATEGORIES= emulators
-MASTER_SITES= https://github.com/LekKit/patches-misc/releases/download/rvvm-uboot-2024.7/:fw \
- https://github.com/LekKit/riscv-tests/releases/download/rvvm-tests/:tests
-DISTFILES= ${FWFILES:.bin=.bin:fw} riscv-tests.tar.gz:tests
-DIST_SUBDIR= rvvm-${DISTVERSION}
+MASTER_SITES= https://github.com/LekKit/patches-misc/releases/download/rvvm-uboot-2024.7/:fw
+DISTFILES= ${FWFILES:.bin=.bin:fw}
EXTRACT_ONLY= ${DISTFILE_DEFAULT}
MAINTAINER= fuz@FreeBSD.org
@@ -23,14 +21,19 @@
FLAVOR?= ${FLAVORS:[1]}
nox11_PKGNAMESUFFIX= -nox11
-USES= gmake localbase:ldflags
+USES= gmake localbase:ldflags pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= LekKit
+GH_TAGNAME= 31bf78ceb001632d01c0d4f23df3e7b981884183
USE_LDCONFIG= yes
BUILDDIR= ${WRKDIR}/.build
-MAKE_ENV+= BUILDDIR=${BUILDDIR}
+MAKE_ENV+= BUILDDIR=${BUILDDIR} \
+ USE_LIB=1 \
+ USE_LIB_STATIC=1 \
+ USE_LIB_SHARING=1
TEST_TARGET= test
+TEST_DEPENDS= curl:ftp/curl
SUB_FILES= pkg-message
OPTIONS_DEFINE= FDT FPU JIT JNI SPINLOCK_DEBUG NET PCI RV64
@@ -52,11 +55,10 @@
.endfor
.if ${FLAVOR} == x11
-MAKE_ENV+= USE_FB=1 USE_XSHM=1
USES+= xorg
USE_XORG+= x11 xext
.else
-MAKE_ENV+= USE_FB=0 USE_XSHM=0
+MAKE_ENV+= USE_GUI=0 USE_X11=0 USE_WAYLAND=0 USE_SDL=0
.endif
.include <bsd.port.pre.mk>
@@ -73,7 +75,4 @@
${INSTALL_DATA} ${_DISTDIR}/$f ${STAGEDIR}${DATADIR}/
.endfor
-pre-test:
- ${LN} -sf ${_DISTDIR}/riscv-tests.tar.gz ${BUILDDIR}/
-
.include <bsd.port.post.mk>
diff --git a/emulators/rvvm/distinfo b/emulators/rvvm/distinfo
--- a/emulators/rvvm/distinfo
+++ b/emulators/rvvm/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1737591303
-SHA256 (rvvm-0.6/fw_jump.bin) = 60f5aedaf90be271eef9e4f1a479171c183987f97f86208811e9212b121d5b45
-SIZE (rvvm-0.6/fw_jump.bin) = 136776
-SHA256 (rvvm-0.6/fw_payload.bin) = d97321ca71be85a98dcc1757b721616d6ed68304afe853336273cb19b424da6c
-SIZE (rvvm-0.6/fw_payload.bin) = 2958016
-SHA256 (rvvm-0.6/riscv-tests.tar.gz) = f0e888a8db158b1e82ac09cebd01d8e1d5913477d1515c41286fae5e309e5322
-SIZE (rvvm-0.6/riscv-tests.tar.gz) = 87062
-SHA256 (rvvm-0.6/LekKit-RVVM-v0.6_GH0.tar.gz) = 97e98c95d8785438758b81fb5c695b8eafb564502c6af7f52555b056e3bb7d7a
-SIZE (rvvm-0.6/LekKit-RVVM-v0.6_GH0.tar.gz) = 313342
+TIMESTAMP = 1771430387
+SHA256 (fw_jump.bin) = 60f5aedaf90be271eef9e4f1a479171c183987f97f86208811e9212b121d5b45
+SIZE (fw_jump.bin) = 136776
+SHA256 (fw_payload.bin) = d97321ca71be85a98dcc1757b721616d6ed68304afe853336273cb19b424da6c
+SIZE (fw_payload.bin) = 2958016
+SHA256 (LekKit-RVVM-g20260217-31bf78ceb001632d01c0d4f23df3e7b981884183_GH0.tar.gz) = 02156a8b7178064683e4d134f549103cceaf910759e0c56eae621c5e26e5a23f
+SIZE (LekKit-RVVM-g20260217-31bf78ceb001632d01c0d4f23df3e7b981884183_GH0.tar.gz) = 524455
diff --git a/emulators/rvvm/files/patch-Makefile b/emulators/rvvm/files/patch-Makefile
deleted file mode 100644
--- a/emulators/rvvm/files/patch-Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile.orig 2024-03-18 16:11:18 UTC
-+++ Makefile
-@@ -33,7 +33,7 @@ BOLD := $(shell tput md $(NULL_STDERR) || tput bo
- SPACE :=
- ifneq (,$(TERM))
- BOLD := $(shell tput md $(NULL_STDERR) || tput bold $(NULL_STDERR) || printf "\033[1m" $(NULL_STDERR))
--RESET := $(shell tput me $(NULL_STDERR) || tput sgr0 $(NULL_STDERR) || printf "\033[0m" $(NULL_STDERR))$(BOLD)
-+RESET := $(shell tput me $(NULL_STDERR) || tput sgr0 $(NULL_STDERR) || printf "\033[0m" $(NULL_STDERR))
- RED := $(shell tput AF 1 $(NULL_STDERR) || tput setaf 1 $(NULL_STDERR) || printf "\033[31m" $(NULL_STDERR))$(BOLD)
- GREEN := $(shell tput AF 2 $(NULL_STDERR) || tput setaf 2 $(NULL_STDERR) || printf "\033[32m" $(NULL_STDERR))$(BOLD)
- YELLOW := $(shell tput AF 3 $(NULL_STDERR) || tput setaf 3 $(NULL_STDERR) || printf "\033[33m" $(NULL_STDERR))$(BOLD)
-@@ -231,8 +231,8 @@ endif
-
- # Warning options (Strict safety/portability, stack/object size limits)
- # -Wbad-function-cast, -Wcast-align, -Wdouble-promotion need fixes in codebase
--WARN_OPTS := -Wall -Wextra -Wshadow -Wvla -Wpointer-arith -Walloca -Wduplicated-cond \
---Wtrampolines -Wlarger-than=1048576 -Wframe-larger-than=32768 -Werror=return-type
-+WARN_OPTS := -Wall -Wextra -Wshadow -Wvla -Wpointer-arith -Walloca \
-+-Wlarger-than=1048576 -Wframe-larger-than=32768 -Werror=return-type
-
- # Compiler-specific options
- ifeq ($(CC_TYPE),gcc)
-@@ -467,13 +467,11 @@ endif
- endif
-
- # Do not pass lib-related flags for dev/cli/test builds (Faster)
--ifneq (,$(findstring lib, $(MAKECMDGOALS))$(findstring install, $(MAKECMDGOALS)))
- override CFLAGS += -DUSE_LIB -fPIC -ffat-lto-objects
- # Build JNI bindings inside librvvm dynlib
- ifeq ($(USE_JNI),1)
- SRC += $(SRCDIR)/bindings/jni/rvvm_jni.c
- endif
--endif
-
- # CPU interpreter sources
- SRC += $(wildcard $(SRCDIR)/cpu/riscv_*.c)
-@@ -583,10 +581,10 @@ test: $(BINARY)
- @echo
- @echo "[$(YELLOW)INFO$(RESET)] Running RISC-V Tests (RV32)"
- @echo
-- @for file in $(BUILDDIR)/riscv-tests/rv32*.bin; do \
-+ @for file in $(BUILDDIR)/riscv-tests/rv32*; do \
- result=$$($(BINARY) $$file -nogui -rv32 | tr -d '\0'); \
- result="$${result##* }"; \
-- if [[ "$$result" == "0" ]]; then \
-+ if [ "$$result" -eq "0" ]; then \
- echo "[$(GREEN)PASS$(RESET)] $$file"; \
- else \
- echo "[$(RED)FAIL: $$result$(RESET)] $$file"; \
-@@ -596,10 +594,10 @@ ifeq ($(USE_RV64),1)
- @echo
- @echo "[$(YELLOW)INFO$(RESET)] Running RISC-V Tests (RV64)"
- @echo
-- @for file in $(BUILDDIR)/riscv-tests/rv64*.bin; do \
-+ @for file in $(BUILDDIR)/riscv-tests/rv64*; do \
- result=$$($(BINARY) $$file -nogui -rv64 | tr -d '\0'); \
- result="$${result##* }"; \
-- if [[ "$$result" == "0" ]]; then \
-+ if [ "$$result" -eq "0" ]; then \
- echo "[$(GREEN)PASS$(RESET)] $$file"; \
- else \
- echo "[$(RED)FAIL: $$result$(RESET)] $$file"; \
-@@ -647,11 +645,10 @@ ifeq ($(HOST_POSIX),1)
- @install -Dm755 $(BINARY) $(DESTDIR)$(bindir)/rvvm
- @install -Dm755 $(SHARED) $(DESTDIR)$(libdir)/librvvm$(LIB_EXT)
- @install -Dm644 $(STATIC) $(DESTDIR)$(libdir)/librvvm_static.a
-+ @install -d $(DESTDIR)$(includedir)/rvvm
- @install -Dm644 $(SRCDIR)/rvvmlib.h $(DESTDIR)$(includedir)/rvvm/rvvmlib.h
- @install -Dm644 $(SRCDIR)/fdtlib.h $(DESTDIR)$(includedir)/rvvm/fdtlib.h
- @install -Dm644 $(SRCDIR)/devices/*.h $(DESTDIR)$(includedir)/rvvm/
-- @install -d $(DESTDIR)$(datadir)/licenses/rvvm/
-- @install -Dm644 LICENSE* $(DESTDIR)$(datadir)/licenses/rvvm/
- else
- @echo "[$(RED)WARN$(RESET)] Unsupported on non-POSIX!"
- endif
diff --git a/emulators/rvvm/pkg-plist b/emulators/rvvm/pkg-plist
--- a/emulators/rvvm/pkg-plist
+++ b/emulators/rvvm/pkg-plist
@@ -1,30 +1,12 @@
bin/rvvm
-include/rvvm/ata.h
-include/rvvm/chardev.h
-include/rvvm/clint.h
-include/rvvm/eth-oc.h
-include/rvvm/fb_window.h
-include/rvvm/fdtlib.h
-include/rvvm/framebuffer.h
-include/rvvm/gpio-sifive.h
-include/rvvm/gpio_api.h
-include/rvvm/hid_api.h
-include/rvvm/hid_dev.h
-include/rvvm/i2c-hid.h
-include/rvvm/i2c-oc.h
-include/rvvm/mtd-physmap.h
-include/rvvm/ns16550a.h
-include/rvvm/nvme.h
-include/rvvm/pci-bus.h
-include/rvvm/plic.h
-include/rvvm/ps2-altera.h
-include/rvvm/rtc-ds1742.h
-include/rvvm/rtc-goldfish.h
-include/rvvm/rtl8169.h
-include/rvvm/rvvmlib.h
-include/rvvm/syscon.h
-include/rvvm/tap_api.h
+include/rvvm/rvvm.h
+include/rvvm/rvvm_blk.h
+include/rvvm/rvvm_char.h
+include/rvvm/rvvm_fb.h
+include/rvvm/rvvm_gpio.h
lib/librvvm.so
lib/librvvm_static.a
+libdata/pkgconfig/rvvm-static.pc
+libdata/pkgconfig/rvvm.pc
%%DATADIR%%/fw_jump.bin
%%DATADIR%%/fw_payload.bin

File Metadata

Mime Type
text/plain
Expires
Sat, Jun 13, 1:38 AM (10 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33918395
Default Alt Text
D55356.id172181.diff (7 KB)

Event Timeline