minor emacs build improvements

diff --git a/emacs b/emacs
index e99db9951b1ce86a4d36e1247d059b1051aa7ea6..4dc47efe795a6fcb0bc3acb1709802e265a31f8c 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -21,15 +21,16 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
 update=false
 recompile=true
+export FORCE_RECOMPILE=true
 show_pkgs=false
 
 while [[ $1 == -* ]]; do
-    case $1 in
-        --no-r) recompile=false; shift ;;
-        -u) update=true; shift ;;
-        -p) show_pkgs=true; shift ;;
-        --) break ;;
-    esac
+  case $1 in
+    --no-r) recompile=false; unset FORCE_RECOMPILE; shift ;;
+    -u) update=true; shift ;;
+    -p) show_pkgs=true; shift ;;
+    --) break ;;
+  esac
 done
 
 e() { echo "$*"; "$@"; }
@@ -37,16 +38,27 @@ e() { echo "$*"; "$@"; }
 # Og = optmize, but keep gdb working
 export CFLAGS="-Og -g3"
 
-pkgs=(gawk attr autoconf-archive)
+for x in {35..24}; do
+  if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
+    echo $x
+    latest_emacs=emacs$x
+    break
+  fi
+done
+
+pkgs=(gawk attr autoconf-archive git)
 if $show_pkgs; then
-    echo ${pkgs[*]}
-    for x in emacs25 maildir-utils; do
-      # todo, this gives fake provided packages like mailx, and then
-      # fai ignores them.
-      # https://askubuntu.com/questions/21379/how-do-i-find-the-build-dependencies-of-a-package
-      apt-rdepends --build-depends --follow=DEPENDS $x|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
-    done
-    exit 0
+  echo ${pkgs[*]}
+  for x in $latest_emacs maildir-utils; do
+    # todo, this gives fake provided packages like mailx, and then
+    # fai ignores them.
+    # https://askubuntu.com/questions/21379/how-do-i-find-the-build-dependencies-of-a-package
+    if ! type -p apt-rdepends &>/dev/null; then
+      sudo apt-get -y install --purge --auto-remove apt-rdepends
+    fi
+    apt-rdepends --build-depends --follow=DEPENDS $x|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
+  done
+  exit 0
 fi
 
 
@@ -57,23 +69,23 @@ 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 emacs25
-        ;;&
+  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
 
 
@@ -85,39 +97,39 @@ dir=/a/opt/emacs-`distro-name`
 dir+=`debian-archive` ||: # we may not be on debian
 
 if [[ ! -e $dir ]]; then
-    e cp -ar /a/opt/emacs $dir
-    recompile=true
+  e cp -ar /a/opt/emacs $dir
+  recompile=true
 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
-    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
+  # 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
 
 # temporarily for testing multiple versions
@@ -137,18 +149,18 @@ s 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
+  # 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
 fi
 
 # as of 01-2017, built-in org mode has a bug that
 # org-edit-src-exit does not get bound, so using latest
-/a/bin/buildscripts/org-mode
+#/a/bin/buildscripts/org-mode
 
 if $update; then
-    logq pi bzr
-    cd ~/.emacs.d/src/mediawiki-el
-    bzr pull
+  logq pi bzr
+  cd ~/.emacs.d/src/mediawiki-el
+  bzr pull
 fi