Compare commits

...

9 Commits

5 changed files with 37 additions and 123 deletions

View File

@ -2,114 +2,23 @@
# shellcheck disable=2034
#
# /etc/makepkg.conf
# ~/.makepkg.conf
#
#########################################################################
# SOURCE ACQUISITION
#########################################################################
#
#-- The download utilities that makepkg should use to acquire sources
# Format: 'protocol::agent'
DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
'rsync::/usr/bin/rsync --no-motd -z %u %o'
'scp::/usr/bin/scp -C %u %o')
# Other common tools:
# /usr/bin/snarf
# /usr/bin/lftpget -c
# /usr/bin/wget
#-- The package required by makepkg to download VCS sources
# Format: 'protocol::package'
VCSCLIENTS=('bzr::bzr'
'fossil::fossil'
'git::git'
'hg::mercurial'
'svn::subversion')
#########################################################################
# ARCHITECTURE, COMPILE FLAGS
#########################################################################
#
CARCH="x86_64"
CHOST="x86_64-pc-linux-gnu"
#-- Compiler and Linker Flags
#CPPFLAGS=""
CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-fstack-clash-protection -fcf-protection"
CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
#RUSTFLAGS="-C opt-level=2"
#-- Make Flags: change this for DistCC/SMP systems
MAKEFLAGS="-j$(nproc)"
#-- Debugging flags
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
#DEBUG_RUSTFLAGS="-C debuginfo=2"
#########################################################################
# BUILD ENVIRONMENT
#########################################################################
#
# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
# A negated environment option will do the opposite of the comments below.
#
#-- distcc: Use the Distributed C/C++/ObjC compiler
#-- color: Colorize output messages
#-- ccache: Use ccache to cache compilation
#-- check: Run the check() function if present in the PKGBUILD
#-- sign: Generate PGP signature file
#
BUILDENV=(!distcc color !ccache check sign)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.
#DISTCC_HOSTS=""
#
#-- Specify a directory for package building.
#BUILDDIR=/tmp/makepkg
#########################################################################
# GLOBAL PACKAGE OPTIONS
# These are default values for the options=() settings
#########################################################################
#
# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries
#-- docs: Save doc directories specified by DOC_DIRS
#-- libtool: Leave libtool (.la) files in packages
#-- staticlibs: Leave static library (.a) files in packages
#-- emptydirs: Leave empty directories in packages
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
#-- purge: Remove files specified by PURGE_TARGETS
#-- debug: Add debugging flags as specified in DEBUG_* variables
#
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
INTEGRITY_CHECK=(sha512 b2)
#-- Options to be used when stripping binaries. See `man strip' for details.
STRIP_BINARIES="--strip-all"
#-- Options to be used when stripping shared libraries. See `man strip' for details.
STRIP_SHARED="--strip-unneeded"
#-- Options to be used when stripping static libraries. See `man strip' for details.
STRIP_STATIC="--strip-debug"
#-- Manual (man and info) directories to compress (if zipman is specified)
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
#-- Doc directories to remove (if !docs is specified)
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
#-- Files to be removed from all packages (if purge is specified)
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#-- Directory to store source code in for debug packages
DBGSRCDIR="/usr/src/debug"
#########################################################################
# PACKAGE OUTPUT
@ -129,25 +38,3 @@ LOGDEST=/var/log/makepkg
PACKAGER="George Rawlinson <grawlinson@archlinux.org>"
#-- Specify a key to use for package signing
GPGKEY="034D823DA2055BEE6A6BF0BB25EA6900D9EA5EBC"
#########################################################################
# COMPRESSION DEFAULTS
#########################################################################
#
COMPRESSGZ=(gzip -c -f -n)
COMPRESSBZ2=(bzip2 -c -f)
COMPRESSXZ=(xz -c -z -)
COMPRESSZST=(zstd -c -T0 --ultra -20 -)
COMPRESSLRZ=(lrzip -q)
COMPRESSLZO=(lzop -q)
COMPRESSZ=(compress -c -f)
COMPRESSLZ4=(lz4 -q)
COMPRESSLZ=(lzip -c -f)
#########################################################################
# EXTENSION DEFAULTS
#########################################################################
#
PKGEXT='.pkg.tar.zst'
SRCEXT='.src.tar.gz'

View File

@ -39,6 +39,7 @@
smtpencryption = tls
smtpserverport = 587
annotate = true
[format]
signoff = true

View File

@ -113,13 +113,15 @@ snippet buildgo "Build (Go)" i
export CGO_CPPFLAGS="${CPPFLAGS}"
export CGO_CFLAGS="${CFLAGS}"
export CGO_CXXFLAGS="${CXXFLAGS}"
export GOPATH="${srcdir}"
go build -v \
-trimpath \
-buildmode=pie \
-mod=readonly \
-modcacherw \
-ldflags "-linkmode external -extldflags ${LDFLAGS}" \
-ldflags "-compressdwarf=false \
-linkmode external \
-extldflags ${LDFLAGS}" \
-o build \
.
endsnippet
@ -180,4 +182,19 @@ snippet pkgcl "Package (Common Lisp)" i
"$pkgdir/usr/share/common-lisp/source/$_pkgname"
endsnippet
#
# Python specific
#
snippet buildpy "Build (Python)" i
python -m build --wheel --no-isolation
endsnippet
snippet chkpy "Check (Python)" i
pytest -v
endsnippet
snippet pkgpy "Package (Python)" i
python -m installer --destdir="$pkgdir" dist/*.whl
endsnippet
# vim: tabstop=2 shiftwidth=2 expandtab

View File

@ -2,6 +2,8 @@ call plug#begin()
" plugins
Plug 'SirVer/ultisnips'
Plug 'theacodes/witchhazel'
Plug 'NoahTheDuke/vim-just'
call plug#end()
@ -34,6 +36,10 @@ noremap <Right> <NOP>
syntax enable
let g:load_doxygen_syntax=1
" theme
" set termguicolors
" colorscheme witchhazel-hypercolor
" enable filetype plugins
filetype plugin indent on
autocmd FileType javascript setlocal tabstop=2 shiftwidth=2 expandtab

View File

@ -27,9 +27,9 @@ if command -v tmux &> /dev/null; then
}
# auto-start tmux
if [ -z "${TMUX}" ]; then
tmux -f ~/.config/tmux/tmux.conf
fi
#if [ -z "${TMUX}" ]; then
# tmux -f ~/.config/tmux/tmux.conf
#fi
fi
# rust/cargo
@ -40,10 +40,10 @@ if command -v cargo &> /dev/null; then
fi
# ruby
if command -v ruby &> /dev/null; then
# Add rubygem binary directory to $PATH
path+=("$(ruby -e "puts Gem.user_dir")/bin")
fi
#if command -v ruby &> /dev/null; then
# # Add rubygem binary directory to $PATH
# path+=("$(ruby -e "puts Gem.user_dir")/bin")
#fi
# python-pip
if command -v pip &> /dev/null; then
@ -74,4 +74,7 @@ fi
# finally, export $PATH
export PATH
# ❤️ zmv
autoload -Uz zmv
# vim: ft=zsh expandtab tabstop=2 shiftwidth=2