iankelling.org
/
git
/
buildscripts
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
06165f1
)
build nox emacs for remote servers
author
Ian Kelling
<iank@fsf.org>
Tue, 8 Sep 2020 19:58:56 +0000
(15:58 -0400)
committer
Ian Kelling
<iank@fsf.org>
Tue, 8 Sep 2020 19:58:56 +0000
(15:58 -0400)
emacs
patch
|
blob
|
history
diff --git
a/emacs
b/emacs
index 6acef0bc269d6deac5b672767e6d29a5e92d7596..6b5ec5c8eef9ea75c5767c890e147586ed2ec131 100755
(executable)
--- a/
emacs
+++ b/
emacs
@@
-29,14
+29,16
@@
while [[ $1 == -* ]]; do
-u) update=true; shift ;;
-p) show_pkgs=true; shift ;;
--) break ;;
-u) update=true; shift ;;
-p) show_pkgs=true; shift ;;
--) break ;;
+ *) echo "$0: error: bad arg: $1" >&2; exit 1 ;;
esac
done
esac
done
-e() { echo "$*"; "$@"; }
# Og = optmize, but keep gdb working
export CFLAGS="-Og -g3"
# Og = optmize, but keep gdb working
export CFLAGS="-Og -g3"
+export DEBIAN_FRONTEND=noninteractive
+pupdate
for x in {35..24}; do
if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
echo $x
for x in {35..24}; do
if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
echo $x
@@
-71,22
+73,25
@@
fi
pi ${pkgs[@]}
#git repo
pi ${pkgs[@]}
#git repo
-dir=/a/opt/emacs-`distro-name`
-dir+=`debian-archive` ||: # we may not be on debian
+dir=/a/opt/emacs-$(distro-name)$(distro-num)
+
+# e/e because autofs failing to mount will make it so
+# you cant ls whatever directory it is in, so we
+# need an extra directory
+dirs=($dir $dir-nox/.iank/e/e)
if [[ ! -e $dir ]]; then
if [[ ! -e $dir ]]; then
-
e
cp -ar /a/opt/emacs $dir
+
m
cp -ar /a/opt/emacs $dir
recompile=true
fi
recompile=true
fi
-e cd $dir
-rev=$(cat ~/.local/emacs-build-git-revision 2>/dev/null) ||:
-head=$(git rev-parse HEAD)
+m cd $dir
+rev=$(cat ~/.local/emacs-build-git-revision 2>/dev/null) ||:
+head=$(git rev-parse HEAD)
if $recompile || [[ $rev != "$head" ]]; then
if $recompile || [[ $rev != "$head" ]]; then
-
case $(distro-name) in
fedora )
logq s yum-builddep -y emacs
case $(distro-name) in
fedora )
logq s yum-builddep -y emacs
@@
-106,24
+111,39
@@
if $recompile || [[ $rev != "$head" ]]; then
logq p -y build-dep $latest_emacs
;;&
esac
logq p -y build-dep $latest_emacs
;;&
esac
+fi
-
-
+nox=false
+for d in ${dirs[@]}; do
+ if [[ -d $d ]]; then
+ m cd $d
+ fi
+ if $nox; then
+ m mkdir -p ${d%/*}
+ m rsync --delete -ra $dir/ $d
+ mp=$HOME/.iank/e/e
+ if mountpoint $mp &>/dev/null; then
+ m sudo umount $mp
+ fi
+ m mkdir -p $mp
+ m sudo mount -o bind $d $mp
+ m sudo chown $USER:$USER $mp
+ m cd $mp
+ fi
if $recompile; then
# todo, consider when this should be uncommented
#logq s make uninstall
if $recompile; then
# todo, consider when this should be uncommented
#logq s make uninstall
- find ~/.emacs.d/ -name '*.elc' -delete
+
m
find ~/.emacs.d/ -name '*.elc' -delete
# git version
if [[ $1 ]]; then
# git version
if [[ $1 ]]; then
-
e
i clean -xxxfd
+
m
i clean -xxxfd
elif $update; then
elif $update; then
-
e
i fetch
-
e
i clean -xxxffd
-
e
i reset --hard origin/master
-
e
i clean -xxxffd
+
m
i fetch
+
m
i clean -xxxffd
+
m
i reset --hard origin/master
+
m
i clean -xxxffd
fi
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.
# 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.
@@
-135,25
+155,38
@@
if $recompile || [[ $rev != "$head" ]]; then
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
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
+ fi
+ if $nox; then
+ # mix of flags from arch and debians build flags
+ # note, youd think we could just run make again, but the
+ # build system isnt smart enough, we have to recompile
+ # from scratch.
+ logq ./configure --without-x --without-sound --without-gsettings --without-gconf
+ ln -s ~/.emacs.d .
+ else
logq ./configure
logq ./configure
+ fi
+ if $recompile; then
logq make -j `nproc` bootstrap
fi
logq make -j `nproc` bootstrap
fi
-
- # temporarily for testing multiple versions
logq make -j `nproc`
logq make -j `nproc`
- logq sudo make install
+ if ! $nox; then
+ logq sudo make install
+ # make emacs always work for root
+ sudo /a/exe/lnf /usr/local/bin/emacs /usr/bin
- # make emacs always work for root
- sudo /a/exe/lnf /usr/local/bin/emacs /usr/bin
-
- echo $head >~/.local/emacs-build-git-revision
-fi
+ echo $head >~/.local/emacs-build-git-revision
+ fi
+ nox=true
+done
#git clone https://github.com/djcb/mu
#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
+# note: master failed on t8, i moved back to the commit before a bug
+# https://github.com/djcb/mu/issues/1400
# from its HACKING file
# from its HACKING file
+
cd /a/opt/mu
rev=$(cat ~/.local/mu-build-git-revision 2>/dev/null) ||:
cd /a/opt/mu
rev=$(cat ~/.local/mu-build-git-revision 2>/dev/null) ||: