X-Git-Url: https://iankelling.org/git/?p=buildscripts;a=blobdiff_plain;f=emacs;fp=emacs;h=b2c97406a9c12f44c032806cbf2a5116fa70555a;hp=727dee86a596a6ce3f17f902bcbfb1b963acf032;hb=c426f5dc07b0a086a3163697db3abb516955566c;hpb=850dedd6b7a117c86c4e3e97a4ad1c948e9cd7a0

diff --git a/emacs b/emacs
index 727dee8..b2c9740 100755
--- a/emacs
+++ b/emacs
@@ -58,42 +58,19 @@ if $show_pkgs; then
     if ! type -p apt-rdepends &>/dev/null; then
       sudo apt-get -y install --purge --auto-remove apt-rdepends
     fi
-    apt-rdepends -p --build-depends --follow=DEPENDS $x|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
+    apt-rdepends -p --build-depends --follow=DEPENDS $x/$(debian-codename)|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
   done
   exit 0
 fi
 
 
+#building emacs, INSTALL.BZR
+
 # gawk and attr were no longer automatically installed in stretch,
 # looking back, i assume i got some error.
 # autoconf-archive due to come error
 pi ${pkgs[@]}
 
-
-case $(distro-name) in
-  fedora )
-    logq s yum-builddep -y emacs
-    logq pi texlive-dvipng
-    ;;&
-  debian|ubuntu|trisquel)
-    # todo: unknown for other distros, this will fail
-    logq p -y build-dep maildir-utils
-    # oddly, on ubuntu 14.04 this installs postfix, but I dun care
-    # ubuntu 14.04 gave this error message
-    # Unable to satisfy the build-depends: Build-Depends: libpng-dev
-    # this is satisfied by dvipng. the build-dep is just wrong
-    # minor bug I'm not going to bother reporting.
-    #
-    # note, useful command to see build dep packagages:
-    # apt-rdepends --build-depends --follow=DEPENDS emacs25
-    logq p -y build-dep $latest_emacs
-    ;;&
-esac
-
-
-
-#building emacs, INSTALL.BZR
-
 #git repo
 dir=/a/opt/emacs-`distro-name`
 dir+=`debian-archive` ||: # we may not be on debian
@@ -104,66 +81,105 @@ if [[ ! -e $dir ]]; then
 fi
 e cd $dir
 
-if $recompile; then
-  # todo, consider when this should be uncommented
-  #logq s make uninstall
-  find ~/.emacs.d/ -name '*.elc' -delete
-
-  # git version
-  if [[ $1 ]]; then
-    e i clean -xxxfd
-  elif $update; then
-    e i fetch
-    e i clean -xxxffd
-    e i reset --hard origin/master
-    e i clean -xxxffd
+rev=$(cat ~/.local/emacs-build-git-revision 2>/dev/null) ||:
+head=$(git rev-parse HEAD)
+
+
+
+if $recompile || [[ $rev != "$head" ]]; then
+
+  case $(distro-name) in
+    fedora )
+      logq s yum-builddep -y emacs
+      logq pi texlive-dvipng
+      ;;&
+    debian|ubuntu|trisquel)
+      # todo: unknown for other distros, this will fail
+      logq p -y build-dep maildir-utils/$(debian-codename)
+      # oddly, on ubuntu 14.04 this installs postfix, but I dun care
+      # ubuntu 14.04 gave this error message
+      # Unable to satisfy the build-depends: Build-Depends: libpng-dev
+      # this is satisfied by dvipng. the build-dep is just wrong
+      # minor bug I'm not going to bother reporting.
+      #
+      # note, useful command to see build dep packagages:
+      # apt-rdepends --build-depends --follow=DEPENDS emacs25
+      logq p -y build-dep $latest_emacs
+      ;;&
+  esac
+
+
+
+  if $recompile; then
+    # todo, consider when this should be uncommented
+    #logq s make uninstall
+    find ~/.emacs.d/ -name '*.elc' -delete
+
+    # git version
+    if [[ $1 ]]; then
+      e i clean -xxxfd
+    elif $update; then
+      e i fetch
+      e i clean -xxxffd
+      e i reset --hard origin/master
+      e i clean -xxxffd
+    fi
+
+    # autogen is usually only for the first build, assume it works
+    logq ./autogen.sh all
+    # I tried changing O2 to O3, don't know if it made it faster or slower so I went back to 02.
+    # Also, link-time-optimization based on ./INSTALL
+
+    # for debugging, use -Og, or -O0 to make debug really correspond to sources
+    # dunno why I have had -std=gnu99 in the past
+    #CFLAGS='-std=gnu99 -g3 -Og'
+    export CFLAGS='-g3 -Og'
+    #CFLAGS='-std=gnu99 -g3 -O2' logq ./configure --enable-link-time-optimization
+    # on ubuntu 12.04, the above fails, says my c compiler won't work, so intead, just use defaults
+    logq ./configure
+    logq make -j `nproc` bootstrap
   fi
 
-  # autogen is usually only for the first build, assume it works
-  logq ./autogen.sh all
-  # I tried changing O2 to O3, don't know if it made it faster or slower so I went back to 02.
-  # Also, link-time-optimization based on ./INSTALL
-
-  # for debugging, use -Og, or -O0 to make debug really correspond to sources
-  # dunno why I have had -std=gnu99 in the past
-  #CFLAGS='-std=gnu99 -g3 -Og'
-  export CFLAGS='-g3 -Og'
-  #CFLAGS='-std=gnu99 -g3 -O2' logq ./configure --enable-link-time-optimization
-  # on ubuntu 12.04, the above fails, says my c compiler won't work, so intead, just use defaults
-  logq ./configure
-  logq make -j `nproc` bootstrap
-fi
 
-# temporarily for testing multiple versions
-logq make -j `nproc`
-logq sudo make install
+  # temporarily for testing multiple versions
+  logq make -j `nproc`
+  logq sudo make install
 
-# make emacs always work for root
-s /a/exe/lnf /usr/local/bin/emacs /usr/bin
+  # make emacs always work for root
+  s /a/exe/lnf /usr/local/bin/emacs /usr/bin
 
+  echo $head >~/.local/emacs-build-git-revision
+fi
 
 #git clone https://github.com/djcb/mu
 # note: master failed, i moved back to the commit before a bug https://github.com/djcb/mu/issues/1400
 # from its HACKING file
 
 cd /a/opt/mu
-if [[ $(distro-name) == trisquel ]]; then
-  # use the flidas branch, stuck behind because
-  # needs newer crypt libraries that are too troublesome.
-  cd /a/opt/muflidas
-else
-  # newer version than build-dep installs for buster
-  sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+
+rev=$(cat ~/.local/mu-build-git-revision 2>/dev/null) ||:
+head=$(git rev-parse HEAD)
+if $recompile || [[ $rev != "$head" ]]; then
+
+  if [[ $(distro-name) == trisquel ]]; then
+    # use the flidas branch, stuck behind because
+    # needs newer crypt libraries that are too troublesome.
+    cd /a/opt/muflidas
+  else
+    # newer version than build-dep installs for buster
+    sudo apt-get -y install --purge --auto-remove libgmime-3.0-dev
+  fi
+  git clean -xfffd
+  ./autogen.sh
+  make
+  sudo make install
+  echo $head >~/.local/mu-build-git-revision
+  # note uninstall is implemented
 fi
-git clean -xfffd
-./autogen.sh
-make
-sudo make install
-# note uninstall is implemented
 
 if $recompile; then
   # note, not totally sure its right to put this within recompile, but its taking up most of the time, so going for it.
-  logq emacs --batch -l ~/.emacs.d/init.el -l ~/.emacs.d/compile-init-dir.el
+  logq emacs --batch -l ~/.emacs.d/compile-init-dir.el
 fi
 
 # as of 01-2017, built-in org mode has a bug that