Update

diff --git a/.crossenv.zsh b/.crossenv.zsh
index 4a0f182575641e75a9741198f382d15cfe9ef3f4..35e6ffa7bcc4c8ad57a9d056feaeaff31c1a1018 100644 (file)
--- a/.crossenv.zsh
+++ b/.crossenv.zsh
@@ -1,26 +1,36 @@
 iphoneos-arm64-proenv() {
-       MEMO_TARGET='iphoneos-arm64' PLATFORM='iphoneos' MEMO_ARCH='arm64' TARGET_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk' MACOSX_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/MacOSX12.0.sdk' GNU_HOST_TRIPLE='aarch64-apple-darwin'
-       CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld ' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib   ' STRIP='aarch64-apple-darwin-strip' NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' EXTRA='' SED='sed ' LDID='ldid' GINSTALL='install ' LN='ln' CP='cp'
-       BUILD_ROOT='/usr/home/cameron/Documents/iOS/Procursus' BUILD_BASE='/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500' BUILD_INFO='/usr/home/cameron/Documents/iOS/Procursus/build_info' BUILD_WORK='/usr/home/cameron/Documents/iOS/Procursus/build_work/iphoneos-arm64/1500' BUILD_STAGE='/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1500' BUILD_DIST='/usr/home/cameron/Documents/iOS/Procursus/build_dist/iphoneos-arm64/1500' BUILD_STRAP='/usr/home/cameron/Documents/iOS/Procursus/build_strap/iphoneos-arm64/1500' BUILD_TOOLS='/usr/home/cameron/Documents/iOS/Procursus/build_tools'
-       DEB_ARCH='iphoneos-arm' DEB_ORIGIN='' DEB_MAINTAINER='Cameron Katri <me@cameronkatri.com>'
-       CFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/Library/Frameworks'
-       CXXFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/Library/Frameworks'
-       CPPFLAGS='-arch arm64 -miphoneos-version-min=12.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/include -Wno-error-implicit-function-declaration'
-       LDFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/lib -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/usr/local/lib -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1500/Library/Frameworks -liosexec'
-       export MEMO_TARGET PLATFORM MEMO_ARCH TARGET_SYSROOT MACOSX_SYSROOT GNU_HOST_TRIPLE
-       export CC CXX AR LD CPP RANLIB STRIP NM LIPO OTOOL I_N_T EXTRA SED LDID GINSTALL LN CP
-       export BUILD_ROOT BUILD_BASE BUILD_INFO BUILD_WORK BUILD_STAGE BUILD_DIST BUILD_STRAP BUILD_TOOLS
-       export DEB_ARCH DEB_ORIGIN DEB_MAINTAINER
-       export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+        MEMO_TARGET='iphoneos-arm64' PLATFORM='iphoneos' MEMO_ARCH='arm64' TARGET_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk'
+        MACOSX_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/MacOSX12.sdk' GNU_HOST_TRIPLE='aarch64-apple-darwin'
+        CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib' STRIP='aarch64-apple-darwin-strip'
+        NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' EXTRA='' INSTALL='/usr/local/gnubin/install --strip-program=aarch64-apple-darwin-strip'
+        BUILD_ROOT='/usr/home/cameron/Documents/iOS/Procursus' BUILD_BASE='/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700' BUILD_INFO='/usr/home/cameron/Documents/iOS/Procursus/build_info'
+        BUILD_WORK='/usr/home/cameron/Documents/iOS/Procursus/build_work/iphoneos-arm64/1700' BUILD_STAGE='/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700' BUILD_DIST='/usr/home/cameron/Documents/iOS/Procursus/build_dist/iphoneos-arm64/1700'
+        BUILD_STRAP='/usr/home/cameron/Documents/iOS/Procursus/build_strap/iphoneos-arm64/1700' BUILD_TOOLS='/usr/home/cameron/Documents/iOS/Procursus/build_tools'
+        DEB_ARCH='iphoneos-arm' DEB_ORIGIN='' DEB_MAINTAINER='Cameron Katri <me@cameronkatri.com>'
+        CFLAGS='-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks'
+        CXXFLAGS='-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks'
+        CPPFLAGS='-arch arm64 -miphoneos-version-min=14.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -Wno-error-implicit-function-declaration'
+        LDFLAGS='-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/lib -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/lib -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks -liosexec'
+        export MEMO_TARGET PLATFORM MEMO_ARCH TARGET_SYSROOT MACOSX_SYSROOT GNU_HOST_TRIPLE
+        export CC CXX AR LD CPP RANLIB STRIP NM LIPO OTOOL I_N_T EXTRA INSTALL
+        export BUILD_ROOT BUILD_BASE BUILD_INFO BUILD_WORK BUILD_STAGE BUILD_DIST BUILD_STRAP BUILD_TOOLS
+        export DEB_ARCH DEB_ORIGIN DEB_MAINTAINER
+        export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+        DEFAULT_CMAKE_FLAGS='-DCMAKE_BUILD_TYPE=Release -DCMAKE_CROSSCOMPILING=true -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_C_FLAGS=-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks -DCMAKE_CXX_FLAGS=-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks -DCMAKE_FIND_ROOT_PATH=/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700 -DPKG_CONFIG_EXECUTABLE=/usr/home/cameron/Documents/iOS/Procursus/build_tools/cross-pkg-config -DCMAKE_INSTALL_NAME_TOOL=aarch64-apple-darwin-install_name_tool -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_NAME_DIR=/usr/lib -DCMAKE_INSTALL_RPATH=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_OSX_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -DCMAKE_OSX_ARCHITECTURES=arm64'
+        DEFAULT_CONFIGURE_FLAGS='--build=x86_64-unknown-freebsd14.0 --host=aarch64-apple-darwin --prefix=/usr --localstatedir=/var --sysconfdir=/etc --bindir=/usr/bin --mandir=/usr/share/man --enable-silent-rules --disable-dependency-tracking --enable-shared --enable-static'
+        DEFAULT_PERL_MAKE_FLAGS='INSTALLSITEARCH=/usr/lib/perl5/ INSTALLARCHLIB=/usr/lib/perl5/ INSTALLVENDORARCH=/usr/lib/perl5/ INSTALLPRIVLIB=/usr/share/perl5 INSTALLSITELIB=/usr/share/perl5 INSTALLVENDORLIB=/usr/share/perl5 PERL_LIB=/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700/perl//usr/lib/perl5/ PERL_ARCHLIB=/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700/perl//usr/lib/perl5/ PERL_ARCHLIBDEP=/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700/perl//usr/lib/perl5/ PERL_INC=/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700/perl//usr/lib/perl5//CORE PERL_INCDEP=/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700/perl//usr/lib/perl5//CORE PREFIX=/usr INSTALLMAN1DIR=/usr/share/man/man1 INSTALLSITEMAN1DIR=/usr/share/man/man1 INSTALLVENDORMAN1DIR=/usr/share/man/man1 INSTALLMAN3DIR=/usr/share/man/man3 INSTALLSITEMAN3DIR=/usr/share/man/man3 INSTALLVENDORMAN3DIR=/usr/share/man/man3 PERL=/usr/bin/perl CCFLAGS=-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks LDDLFLAGS=-Os -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/lib -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/lib -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks -liosexec -shared'
+        DEFAULT_PERL_BUILD_FLAGS='cc=aarch64-apple-darwin-clang ld=aarch64-apple-darwin-clang destdir=/usr/home/cameron/Documents/iOS/Procursus/build_stage/iphoneos-arm64/1700/libmodule-build-perl install_base=/usr install_path=lib=/usr/share/perl5 install_path=arch=/usr/lib/perl5/ install_path=bin=/usr/bin install_path=script=/usr/bin install_path=libdoc=/usr/share/man/man3 install_path=bindoc=/usr/share/man/man1 install_path=html=/usr/share/doc/perl5'
+        DEFAULT_GOLANG_FLAGS='GOOS=ios GOARCH=arm64 CGO_CFLAGS= -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks CGO_CXXFLAGS= -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks CGO_CPPFLAGS=-arch arm64 -miphoneos-version-min=14.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/include -isystem /usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/include -Wno-error-implicit-function-declaration CGO_LDFLAGS= -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/lib -L/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/usr/local/lib -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/System/Library/Frameworks -F/usr/home/cameron/Documents/iOS/Procursus/build_base/iphoneos-arm64/1700/Library/Frameworks -liosexec CGO_ENABLED=1 CC=aarch64-apple-darwin-clang CXX=aarch64-apple-darwin-clang++ CPP=aarch64-apple-darwin-clang -E'
+        export DEFAULT_CMAKE_FLAGS DEFAULT_CONFIGURE_FLAGS DEFAULT_PERL_MAKE_FLAGS DEFAULT_PERL_BUILD_FLAGS DEFAULT_GOLANG_FLAGS
 }
 
 apple_cmds-env() {
-       TARGET_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk'
+       TARGET_SYSROOT='/usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk'
        CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib' STRIP='aarch64-apple-darwin-strip' NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' LDID='ldid'
-       CFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -isystem /usr/home/cameron/Documents/iOS/apple_cmds/base/include'
-       CXXFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -isystem /usr/home/cameron/Documents/iOS/apple_cmds/base/include'
-       CPPFLAGS='-arch arm64 -miphoneos-version-min=12.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -isystem /usr/home/cameron/Documents/iOS/apple_cmds/base/include'
-       LDFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk -miphoneos-version-min=12.0 -L/usr/home/cameron/Documents/iOS/apple_cmds/base/lib'
+       CFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/apple_cmds/base/include'
+       CXXFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -isystem /usr/home/cameron/Documents/iOS/apple_cmds/base/include'
+       CPPFLAGS='-arch arm64 -miphoneos-version-min=14.0 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -isystem /usr/home/cameron/Documents/iOS/apple_cmds/base/include'
+       LDFLAGS='-Os -g -arch arm64 -isysroot /usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk -miphoneos-version-min=14.0 -L/usr/home/cameron/Documents/iOS/apple_cmds/base/lib'
        export CC CXX AR LD CPP RANLIB STRIP NM LIPO OTOOL I_N_T LDID
        export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 }
@@ -47,11 +57,11 @@ darwin-amd64-env() {
 
 darwin-env() {
        CC='aarch64-apple-darwin-clang' CXX='aarch64-apple-darwin-clang++' AR='aarch64-apple-darwin-ar' LD='aarch64-apple-darwin-ld' CPP='aarch64-apple-darwin-clang -E' RANLIB='aarch64-apple-darwin-ranlib' STRIP='aarch64-apple-darwin-strip' NM='aarch64-apple-darwin-nm' LIPO='aarch64-apple-darwin-lipo' OTOOL='aarch64-apple-darwin-otool' I_N_T='aarch64-apple-darwin-install_name_tool' LDID='ldid'
-       OPTIMIZATION_FLAGS="-Os -g -flto=thin"
+       OPTIMIZATION_FLAGS="-Os -g"
        DEFAULT_CFLAGS="${OPTIMIZATION_FLAGS} -isystem ${HOME}/Documents/iOS/include"
        DEFAULT_CPPFLAGS="${OPTIMIZATION_FLAGS} -isystem ${HOME}/Documents/iOS/include"
        DEFAULT_CXXLAGS="${OPTIMIZATION_FLAGS} -isystem ${HOME}/Documents/iOS/include"
-       DEFAULT_LDFLAGS="${OPTIMIZATION_FLAGS}"
+       DEFAULT_LDFLAGS="${OPTIMIZATION_FLAGS} -L${HOME}/Documents/iOS/lib"
        IPHONEOS_CFLAGS="-arch arm64 -isysroot ${IPHONEOS_SYSROOT} -miphoneos-version-min=14.0"
        WATCHOS_CFLAGS="-arch arm64_32 -isysroot ${WATCHOS_SYSROOT} -mwatchos-version-min=7.0"
        TVOS_CFLAGS="-arch arm64 -isysroot ${TVOS_SYSROOT} -mappletvos-version-min=14.0"
@@ -85,15 +95,16 @@ watchos-arm64_32-env() {
 
 # Procursus Env Vars
 export MACOSX_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/MacOSX12.sdk
-export IPHONEOS_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk
+export IPHONEOS_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/iPhoneOS12.0.sdk
 export WATCHOS_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/WatchOS7.2.sdk
 export TVOS_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/AppleTVOS14.3.sdk
-export TARGET_SYSROOT=${IPHONEOS_SYSROOT}
+export TARGET_SYSROOT=/usr/home/cameron/Documents/iOS/SDK/iPhoneOS14.3.sdk
 export DEB_MAINTAINER="Cameron Katri <me@cameronkatri.com>"
 export MEMO_DEVICE_IP=localhost
 export MEMO_DEVICE_PORT=2222
 export MEMO_PGP_SIGN_KEY=7D3B36CEA40FCC2181FB6DCDBAFFD97826540F1C
 export MEMO_TARGET=iphoneos-arm64
+export MEMO_LDID_EXTRA_FLAGS=-K/usr/home/cameron/Documents/iOS/Procursus/signcert.p12
 export DPKG_TYPE=xz
 export GNUBINDIR=/usr/local/gnubin
 export THEOS=~/Documents/iOS/theos

diff --git a/.cwmrc b/.cwmrc
index 4bc48986cbb27f6f6befb4e9f3be776abc42fa08..a9ecc37fb28096cfc0c545ebc3f76a12b76ae3ee 100644 (file)
--- a/.cwmrc
+++ b/.cwmrc
@@ -5,9 +5,10 @@ command term st
 bind-key 4-Return "st -e tmux"
 bind-key 4-w firefox
 bind-key 4-q window-close
-bind-key 4-t "st -e neomutt"
+bind-key 4-t "st -e tmux new-session -s mail neomutt"
 bind-key 4-space menu-exec
 bind-key 4C-s "xset dpms force off"
+bind-key 4-m multimc
 
 command firefox firefox
 

diff --git a/.gitconfig b/.gitconfig
index af5478695007327b3abb256742d3bb1a3cf79d4e..249ba3320a8324afec5f97ae189eafc468a6d2d2 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,7 @@
        interactive = auto
        ui = true
        pager = true
+       diffFilter = diff-highlight
 [interactive]
        diffFilter = diff-highlight
 [init]

diff --git a/.login_conf b/.login_conf
index 054c5d3dd840dc3432d563b1fe6b5e9b1fb5253b..b49b34eeb3f575a9ad9e922717b58446adf4ef7b 100644 (file)
--- a/.login_conf
+++ b/.login_conf
@@ -5,5 +5,4 @@
 me:\
        :lang=en_US.UTF-8:\
        :charset=UTF-8:\
-       :path=/usr/local/libexec/ccache /usr/local/llvm12/bin /sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/.local/bin ~/Documents/iOS/theos/bin /opt/limd/bin /usr/local/libexec/apple/bin ~/Documents/go/bin:\
-       :umask=027:
+       :path=/usr/local/libexec/ccache /sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/.local/bin ~/Documents/iOS/theos/bin /opt/limd/bin /usr/local/libexec/apple/bin ~/Documents/go/bin:

diff --git a/.zshrc b/.zshrc
old mode 100755 (executable)
new mode 100644 (file)
index cbe0eaa..595c26b
--- a/.zshrc
+++ b/.zshrc
@@ -36,19 +36,18 @@ export LANG=en_US.UTF-8
 # Various editors and fix aliases with sudo
 export EDITOR=nvim
 export COLORTERM=1 CLICOLOR=1
+export JCOLOR=1
 bindkey '^E' edit-command-line
 alias code='code-oss'
 alias sudo='sudo '
 alias fuzz="fzf --preview 'bat --style=numbers,changes --color=always --line-range :500 {}' --preview-window=right:66%"
 alias sort='LC_ALL=C sort'
-# https://reviews.freebsd.org/D30545
 alias diff='LC_ALL=C TZ=UTC diff'
 alias ls='ls --color=auto -F'
 alias diffstat='diffstat -C'
 export BAT_THEME="Nord"
 
 # Setup LSCOLORS, LS_COLORS and completion
-# https://reviews.freebsd.org/D30547
 # https://git.cameronkatri.com/opendircolors
 test -r ~/.nord_colors && eval $(opendircolors ~/.nord_colors)
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
@@ -68,7 +67,6 @@ export GPG_TTY=$(tty)
 
 export LESS='-FiMRx2$z-4$Dd+c$Du+g'
 
-# https://reviews.freebsd.org/D30341
 #if ! mount -t fusefs --libxo=json | \
 #jq -e '.mount.mounted[] | select(.node == "/usr/home/cameron/Documents/smbnetfs")' >/dev/null; then
 #      smbnetfs $HOME/Documents/smbnetfs