fix incompatible libdwarf version

This commit is contained in:
2026-03-12 10:14:49 +01:00
parent 9e8566ff4d
commit 629c0782d5
2 changed files with 18 additions and 19 deletions

View File

@ -44,8 +44,8 @@ rec {
libdwarf_pkgs = libdwarf_pkgs =
import (builtins.fetchTarball { import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/a054d7450768069084142fe597ed2da367813a4a.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/f597e7e9fcf37d8ed14a12835ede0a7d362314bd.tar.gz";
sha256 = "sha256:1wlbz6glkzrl3y7pprw1v4sgkwwzi26qlxqfjzxghdlnny91l3cj"; sha256 = "sha256:1l79hh7jh7m8yc5mvc8dbg6s8rf30bgm994kf07xriqbzwfn158r";
}) { }) {
inherit system; inherit system;
}; };
@ -250,7 +250,7 @@ rec {
''; '';
}; };
wamr = stdenv.mkDerivation rec { wamr = stdenv.mkDerivation {
pname = "wamr"; pname = "wamr";
version = "2.4.4"; version = "2.4.4";
@ -274,7 +274,7 @@ rec {
}; };
libiwasm = buildtype: flags: libiwasm = buildtype: flags:
i386_pkgs.stdenv.mkDerivation rec { i386_pkgs.stdenv.mkDerivation {
pname = "libiwasm"; pname = "libiwasm";
version = "2.4.4"; version = "2.4.4";
@ -315,7 +315,7 @@ rec {
}; };
libiwasm_debug = libiwasm "Debug" "-O0 -ggdb"; libiwasm_debug = libiwasm "Debug" "-O0 -ggdb";
libiwasm_release = libiwasm "Release" "-O2 -DNDEBUG"; libiwasm_release = libiwasm "Release" "-O2 -ggdb -DNDEBUG";
# =========================================================================================== # ===========================================================================================
# Specify dependencies # Specify dependencies
@ -334,6 +334,7 @@ rec {
grub2 grub2
xorriso xorriso
mariadb.client mariadb.client
dbeaver-bin
iwasm iwasm
wamrc wamrc
fail-bin fail-bin

View File

@ -185,20 +185,18 @@ import module:
-e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b regs --flags -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b regs --flags
{{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i RegisterImporter \ {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i RegisterImporter \
-e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b ip --no-gp --ip -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b ip --no-gp --ip
# TODO: Failed to decode DWARF data - wrong libdwarf version? {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b ip
# {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \ {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b ip -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b mem
# {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \ {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b mem -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b regs
# {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \ {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b regs -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b ip --sources
# {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \ {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b ip --sources -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b mem --sources
# {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \ {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b mem --sources -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b regs --sources
# {{ FAIL_IMPORT }} -t {{ BUILD_DIR }}-{{ module }}/trace.pb -i ElfImporter --objdump objdump \
# -e {{ BUILD_DIR }}-{{ module }}/system.elf -v {{ module }} -b regs --sources
{{ FAIL_PRUNE }} -v {{ module }} -b %% --overwrite {{ FAIL_PRUNE }} -v {{ module }} -b %% --overwrite
@echo "Next step: \"just server {{ module }}\"" @echo "Next step: \"just server {{ module }}\""