daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

pkg update and first config fix

Browse Source 
org-brain not working, add org-roam
This commit is contained in:
Daniel Weschke
2022-12-19 23:02:34 +01:00
parent 02b3e07185
commit 82f05baffe
885 changed files with 356098 additions and 36993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
lisp/pdf-tools/build/server/autobuild
View File

@@ -157,8 +157,6 @@ have_packages_installed()
done
which make || return 1
which gcc || which cc || return 1
which g++ || which c++ || return 1
c++ $(pkg-config --cflags poppler) -o /dev/null -E install_test.cpp 2>/dev/null
[ $? -eq 0 ] || return 1
return 0
} >/dev/null 2>&1
@@ -221,7 +219,6 @@ os_centos() {
PACKAGES="autoconf
automake
gcc
gcc-c++
libpng-devel
make
pkgconfig
@@ -242,6 +239,17 @@ os_freebsd() {
return 0
}
# NetBSD
os_netbsd() {
if ! which uname >/dev/null 2>&1 || [ "$(uname -s)" != "NetBSD" ]; then
return 1
fi
PKGCMD=pkgin
PKGARGS=install
PACKAGES="autoconf automake poppler-glib png pkgconf"
return 0
}
# OpenBSD
os_openbsd() {
if ! which uname >/dev/null 2>&1 || [ "$(uname -s)" != "OpenBSD" ]; then
@@ -252,15 +260,6 @@ os_openbsd() {
PACKAGES="autoconf%2.69 automake%1.15 poppler poppler-utils png"
export AUTOCONF_VERSION=2.69
export AUTOMAKE_VERSION=1.15
if whereis clang++ ;then
export CXX=clang++
elif whereis eg++ ;then
export CXX=eg++
else
export CXX=eg++
PACKAGES="${PACKAGES} g++"
fi
export CXXFLAGS="-std=c++11 -I/usr/local/include/poppler -I/usr/local/include"
return 0
}
@@ -274,7 +273,6 @@ os_fedora() {
PACKAGES="autoconf
automake
gcc
gcc-c++
libpng-devel
make
poppler-devel
@@ -296,12 +294,10 @@ os_debian() {
fi
PACKAGES="autoconf
automake
g++
gcc
libpng-dev
libpoppler-dev
libpoppler-glib-dev
libpoppler-private-dev
libz-dev
make
pkg-config"
@@ -318,15 +314,23 @@ os_msys2() {
case $MSYSTEM in
MINGW64)
PACKAGES="base-devel
autoconf
automake
mingw-w64-x86_64-libpng
mingw-w64-x86_64-poppler
mingw-w64-x86_64-imagemagick
mingw-w64-x86_64-toolchain
mingw-w64-x86_64-openssl
mingw-w64-x86_64-zlib" ;;
MINGW32)
PACKAGES="base-devel
autoconf
automake
mingw-w64-i686-libpng
mingw-w64-i686-poppler
mingw-w64-i686-imagemagick
mingw-w64-i686-toolchain
mingw-w64-i686-openssl
mingw-w64-i686-zlib" ;;
MSYS)
case $(uname -m) in
@@ -356,15 +360,15 @@ os_macos() {
elif which brew >/dev/null 2>&1; then
PKGCMD=brew
PKGARGS=install
PACKAGES="pkg-config poppler automake"
PACKAGES="pkg-config poppler autoconf automake"
PKG_INSTALL_AS_ROOT=
# homebrew install libffi as keg-only, meaning we need to set
# brew installs libffi as keg-only, meaning we need to set
# PKG_CONFIG_PATH manually so configure can find it
export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig/"
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:$(brew --prefix libffi)/lib/pkgconfig/:$(brew --prefix zlib)/lib/pkgconfig/"
elif which port >/dev/null 2>&1; then
PKGCMD=port
PKGARGS=install
PACKAGES="pkgconfig poppler automake libpng"
PACKAGES="pkgconfig poppler autoconf automake libpng"
else
return 1
fi
@@ -383,11 +387,15 @@ os_nixos() {
if [ -n "$DRY_RUN" ]; then
return 0
fi
if ! nix-instantiate --eval -E "<nixpkgs>" &>/dev/null; then
echo "File 'nixpkgs' was not found in the Nix path. Using NixOS/nixpkgs"
NIX_PATH="nixpkgs=https://github.com/nixos/nixpkgs/archive/master.tar.gz:$NIX_PATH"
fi
command="AUTOBUILD_NIX_SHELL=true"
command="$command;export AUTOBUILD_NIX_SHELL"
command="$command;$(quote "$0" "$@")"
exec nix-shell --pure --command "$command" \
-p gcc gnumake automake autoconf pkgconfig libpng zlib poppler
exec nix-shell --pure --run "$command" \
-p automake autoconf pkg-config libpng zlib poppler
}
# Gentoo
@@ -404,6 +412,7 @@ os_gentoo() {
sys-devel/automake
sys-devel/gcc
sys-devel/make
sys-libs/glibc
sys-libs/zlib"
return 0
}
@@ -412,7 +421,7 @@ os_gentoo() {
os_void() {
if [ -f "/etc/os-release" ]; then
. /etc/os-release
if [ "$NAME" != "void" ]; then
if [ "$ID" != "void" ]; then
return 1
fi
else
@@ -428,6 +437,55 @@ os_void() {
pkgconf"
PKGCMD=xbps-install
PKGARGS="-Sy"
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/pkgconfig"
return 0
}
# openSUSE (TODO: add support for micro versions)
os_opensuse() {
if [ -f "/etc/os-release" ]; then
. /etc/os-release
if [ "$ID" != "opensuse-leap" ] && [ "$ID" != "opensuse-tumbleweed" ]; then
return 1
fi
else
return 1
fi
PACKAGES="make
automake
autoconf
gcc
libpng16-devel
libpng16-compat-devel
zlib-devel
libpoppler-devel
libpoppler-glib-devel
glib2-devel
pkgconf"
PKGCMD=zypper
PKGARGS="install"
return 0
}
# Alpine Linux
os_alpine() {
if [ -f "/etc/os-release" ]; then
. /etc/os-release
if [ "$ID" != "alpine" ]; then
return 1
fi
else
return 1
fi
PACKAGES="autoconf
automake
libpng-dev
poppler-dev
glib-dev
gcc
build-base"
PKGCMD=apk
PKGARGS="add"
return 0
}
@@ -439,6 +497,7 @@ os_argument() {
freebsd) os_freebsd "$@";;
arch) os_arch "$@";;
centos) os_centos "$@";;
netbsd) os_netbsd "$@";;
openbsd) os_openbsd "$@";;
fedora) os_fedora "$@";;
debian) os_debian "$@";;
@@ -446,6 +505,8 @@ os_argument() {
msys2) os_msys2 "$@";;
nixos) os_nixos "$@";;
void) os_void "$@";;
opensuse) os_opensuse "$@";;
alpine) os_alpine "$@";;
*) echo "Invalid --os argument: $OS"
exit 1
esac || {
@@ -455,7 +516,8 @@ os_argument() {
}
## +-----------------------------------------------------------+
## * Figure out were we are, install deps and build the program
## * Figure out where we are
## ** install deps and build the program
## +-----------------------------------------------------------+
handle_options "$@"
@@ -465,6 +527,7 @@ os_macos "$@" || \
os_freebsd "$@" || \
os_arch "$@" || \
os_centos "$@" || \
os_netbsd "$@" || \
os_openbsd "$@" || \
os_fedora "$@" || \
os_debian "$@" || \
@@ -472,6 +535,8 @@ os_gentoo "$@" || \
os_msys2 "$@" || \
os_nixos "$@" || \
os_void "$@" || \
os_opensuse "$@" || \
os_alpine "$@" || \
{
OS_IS_HANDLED=
if [ -z "$DRY_RUN" ]; then