diff --git a/hw/opentitan/otbn/meson.build b/hw/opentitan/otbn/meson.build index 030d3267910e6..a743e17bab0d1 100644 --- a/hw/opentitan/otbn/meson.build +++ b/hw/opentitan/otbn/meson.build @@ -1,6 +1,5 @@ bitflags_dep = subproject('bitflags').get_variable('bitflags_dep') paste_dep = subproject('paste').get_variable('paste_dep') -oorandom_dep = subproject('oorandom').get_variable('oorandom_dep') ethnum_dep = subproject('ethnum-rs').get_variable('ethnum_dep') if build_machine.system() == 'linux' @@ -20,7 +19,6 @@ otbn_lib = static_library('otbn', dependencies: [ bitflags_dep, paste_dep, - oorandom_dep, ethnum_dep, dl_dep], rust_crate_type: 'staticlib') diff --git a/hw/opentitan/otbn/otbn/meson.build b/hw/opentitan/otbn/otbn/meson.build index 4465282bad1d3..82a02d1072675 100644 --- a/hw/opentitan/otbn/otbn/meson.build +++ b/hw/opentitan/otbn/otbn/meson.build @@ -1,11 +1,7 @@ project('otbn', 'rust', version: '0.1.0') -oorandom_sp = subproject('oorandom') -oorandom_dep = oorandom_sp.get_variable('oorandom_dep') - otbn_lib = static_library('otbn', 'src/lib.rs', - link_with: oorandom_lib, install: true) otbn_dep = declare_dependency(link_with: otbn_lib) diff --git a/subprojects/oorandom.wrap b/subprojects/oorandom.wrap deleted file mode 100644 index 171ce138acd22..0000000000000 --- a/subprojects/oorandom.wrap +++ /dev/null @@ -1,8 +0,0 @@ -[wrap-file] -directory = oorandom-11.1.3 - -source_url = https://mirrors.wikimedia.org/debian/pool/main/r/rust-oorandom/rust-oorandom_11.1.3.orig.tar.gz -source_filename = oorandom-11.1.3.tar.gz -source_hash = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575 - -diff_files = oorandom/0001.patch diff --git a/subprojects/packagefiles/oorandom/0001.patch b/subprojects/packagefiles/oorandom/0001.patch deleted file mode 100644 index bd50538536cd4..0000000000000 --- a/subprojects/packagefiles/oorandom/0001.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -new file mode 100644 -index 0000000000..efcb30ead9 ---- /dev/null -+++ b/meson.build -@@ -0,0 +1,7 @@ -+project('oorandom', 'rust', version: '11.1.3') -+ -+oorandom_lib = static_library('oorandom', -+ 'src/lib.rs', -+ install: true) -+ -+oorandom_dep = declare_dependency(link_with: oorandom_lib)