minor fixes

[buildscripts] / emacs

diff --git a/emacs b/emacs
index b1d3e6b86a7b855116cb34ab90deade7fa8b3930..d6fd0c0b7c65ee2e2411f8718d626c5419a9007b 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -221,16 +221,23 @@ if [[ $(debian-codename) == flidas ]]; then
   # needs newer crypt libraries that are too troublesome.
   cd /a/opt/muflidas
 else
-  # newer version than build-dep installs for buster
-  m sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+  # libgmime-3.0-dev is a newer version than build-dep installs for buster
+  m sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev meson
 fi
 if $recompile || [[ $rev != "$head" ]]; then
   m git clean -xfffd
   m ./autogen.sh && make -j`nproc`
   # note uninstall is implemented
   m sudo make install
-  echo $head >~/.local/mu-build-git-revision
+  echo $head >$last_build
 else
+  # Workaround for some indecipherable build error
+  # that only happens after syncing the mu dir and not building from
+  # scratch. It seems there is some state somewhere, like ~/.local
+  # that doesn't get copied. Found the workaround by reading the Makefile,
+  # then doing a more verbose build with:
+  # ninja -C $PWD/build -v -d explain
+  sudo touch -d @$(($(stat -c%Y build/build.ninja) - 100)) /usr/local/bin/emacs
   m sudo make install
 fi