diff options
author | brooks <brooks@FreeBSD.org> | 2018-08-17 07:49:55 +0800 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2018-08-17 07:49:55 +0800 |
commit | 747bfe81d2707ffe803fca2142f1f881e98e4942 (patch) | |
tree | 04c03baa14ce871459a7a7d0f595502769a79b16 /emulators | |
parent | f7b5dd8d25d82b5f64ee6566a9ca5ecd5497def5 (diff) | |
download | freebsd-ports-gnome-747bfe81d2707ffe803fca2142f1f881e98e4942.tar.gz freebsd-ports-gnome-747bfe81d2707ffe803fca2142f1f881e98e4942.tar.zst freebsd-ports-gnome-747bfe81d2707ffe803fca2142f1f881e98e4942.zip |
Update a newer snapshow to support code generated by the latest
devel/llvm-cheri.
Tell qemu to look for the smbd binary in the expected location (don't
add a RUN_DEPENDS entry as it's optional).
Sponsored by: DARPA, AFRL
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/qemu-cheri/Makefile | 1 | ||||
-rw-r--r-- | emulators/qemu-cheri/Makefile.snapshot | 4 | ||||
-rw-r--r-- | emulators/qemu-cheri/distinfo | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile index b4c30cf684c7..41e2d3c4dca9 100644 --- a/emulators/qemu-cheri/Makefile +++ b/emulators/qemu-cheri/Makefile @@ -43,6 +43,7 @@ CONFIGURE_ARGS+= \ --disable-sdl \ --disable-vte \ --disable-xen \ + --smbd=${LOCALBASE}/sbin/smbd \ --extra-cflags="-g ${EXTRA_CFLAGS}" \ --localstatedir=/var EXTRA_CFLAGS= -DCHERI_UNALIGNED diff --git a/emulators/qemu-cheri/Makefile.snapshot b/emulators/qemu-cheri/Makefile.snapshot index e975e6922654..32b6bc9b1814 100644 --- a/emulators/qemu-cheri/Makefile.snapshot +++ b/emulators/qemu-cheri/Makefile.snapshot @@ -4,6 +4,6 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20180614 +SNAPDATE= 20180727 -QEMU_COMMIT= e47a647e025e69212e6563b2b307a837677b9944 +QEMU_COMMIT= 1356c0d237cc65d95f20f2eac69df3db9de5f6e2 diff --git a/emulators/qemu-cheri/distinfo b/emulators/qemu-cheri/distinfo index 7c80754d8c05..c33f1c5c4667 100644 --- a/emulators/qemu-cheri/distinfo +++ b/emulators/qemu-cheri/distinfo @@ -1,9 +1,5 @@ -TIMESTAMP = 1529085999 -SHA256 (CTSRD-CHERI-qemu-0.d20180614-e47a647e025e69212e6563b2b307a837677b9944_GH0.tar.gz) = d2a5e68c56e10107e212a2f9b7ae2c7c4439d562e19f3cdb54d01e4778526899 -SIZE (CTSRD-CHERI-qemu-0.d20180614-e47a647e025e69212e6563b2b307a837677b9944_GH0.tar.gz) = 16136332 -SHA256 (qemu-capstone-22ead3e_GH0.tar.gz) = c8c73aa3f38d486a1a03f117611d5a82530fd33a2ef6c343256c3a6fac9ebd04 -SIZE (qemu-capstone-22ead3e_GH0.tar.gz) = 2883987 -SHA256 (qemu-dtc-e543880_GH0.tar.gz) = 84878bdcfca30db1ad32fd60ddfd01e08fc00ff0c042d2a758e7e90c08de0b5e -SIZE (qemu-dtc-e543880_GH0.tar.gz) = 176916 +TIMESTAMP = 1533142867 +SHA256 (CTSRD-CHERI-qemu-0.d20180727-1356c0d237cc65d95f20f2eac69df3db9de5f6e2_GH0.tar.gz) = 12fbfc5a6d141dad82ed22ae76bdcd0b66b2ffb655a4bf2545c7dba0e5f2d450 +SIZE (CTSRD-CHERI-qemu-0.d20180727-1356c0d237cc65d95f20f2eac69df3db9de5f6e2_GH0.tar.gz) = 16142190 SHA256 (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9 SIZE (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905 |