Merge pull request #42 from project-81/dev/ubuntu-24

Updates for Ubuntu 24 / Raspberry Pi 5

data/lua-5.4.pc

@@ -0,0 +1,10 @@
+version=5.4.6
+prefix=/usr/local
+libdir=/usr/local/lib
+includedir=/usr/local/include
+
+Name: Lua
+Description: A powerful, fast, lightweight, embeddable scripting language
+Version: 5.4.6
+Cflags: -I${includedir}
+Libs: -L${libdir} -llua -lm

scripts/sh/install_arm_toolchain.sh

@@ -2,7 +2,6 @@ BASE_URL=https://developer.arm.com/-/media/Files/downloads/gnu
 
 GCC_VERSION=12.2
 VARIANT=mpacbti-rel1
-HOST_ARCH=$(uname -m)
 TOOLCHAIN=arm-none-eabi
 
 DIRECTORY=arm-gnu-toolchain-$GCC_VERSION.$VARIANT-$HOST_ARCH-$TOOLCHAIN

scripts/sh/install_debian.sh

@@ -3,9 +3,9 @@
 sudo apt-get update && sudo apt-get upgrade -y
 
 # micropython circuitpython
-TASKS+=(git python rcmpy neovim zsh ninja-src tio clang)
+TASKS+=(git python rcmpy pkgconf lua neovim zsh ninja-src tio clang)
 
-TASKS+=(picotool go fzf-src rust)
+TASKS+=(picotool go fzf-src rust locale)
 
 if is_rpi; then
 	run_install raspberrypi
@@ -14,18 +14,26 @@ fi
 # build tools
 PACKAGES+=(cmake gcc-arm-none-eabi libnewlib-arm-none-eabi build-essential)
 PACKAGES+=(libstdc++-arm-none-eabi-newlib mold gcc-13 g++-13)
+PACKAGES+=(emscripten)
 
 # gnu
 PACKAGES+=(autoconf automake texinfo flex bison help2man gawk libtool-bin)
 
 # unused: swig
-PACKAGES+=(device-tree-compiler pkgconf libncurses-dev)
+PACKAGES+=(device-tree-compiler libncurses-dev)
 
 # gdb and other dev tooling
 PACKAGES+=(gdb-multiarch lcov)
 
 # utilities
-PACKAGES+=(tmux ack htop mtools shellcheck tree)
+PACKAGES+=(tmux ack htop mtools shellcheck tree xdg-utils)
+
+# needed by tio
+PACKAGES+=(libglib2.0-dev)
+
+if is_wsl; then
+	PACKAGES+=(wslu)
+fi
 
 if ! is_rpi; then
 	if ! is_wsl; then

scripts/sh/install_go.sh

@@ -21,7 +21,7 @@ else
 
 	# Determine which variant to download.
 	VARIANT=""
-	case $(uname -m) in
+	case "$HOST_ARCH" in
 		aarch64)
 			VARIANT=arm64;;
 		armv6l)

scripts/sh/install_lua.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+PROJECT=lua
+export LUA_VERSION=5.4
+LUA_RELEASE=6
+
+LUA_VER=$PROJECT-$LUA_VERSION
+LUA_SLUG=$LUA_VER.$LUA_RELEASE
+
+# What does any of this do?
+# export LUA_DIR=/usr/local/lib/$PROJECT/$LUA_VERSION
+# export LUA_CPATH="?.so;$LUA_DIR/?.so"
+# export LUA_PATH="?.$PROJECT;$LUA_DIR/?.$PROJECT"
+
+if ! is_cmd $PROJECT; then
+	safe_pushd "$THIRD_PARTY"
+
+	if [ ! -d $LUA_SLUG ]; then
+		curl -L -R -O https://www.$PROJECT.org/ftp/$LUA_SLUG.tar.gz
+		tar zxf $LUA_SLUG.tar.gz
+		rm $LUA_SLUG.tar.gz
+	fi
+
+	safe_pushd $LUA_SLUG
+
+	make -j all
+	make test
+	sudo_cmd make install
+
+	safe_popd
+
+	safe_popd
+
+	# Copy custom pkgconf file.
+	sudo_cmd mkdir -p /usr/local/lib/pkgconfig
+	sudo_cmd cp "$REPO/data/$LUA_VER.pc" /usr/local/lib/pkgconfig
+fi

scripts/sh/install_pkgconf.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+PROJECT=pkgconf
+
+if ! is_cmd $PROJECT; then
+	clone_third_party_github $PROJECT $PROJECT
+
+	safe_pushd "$THIRD_PARTY/$PROJECT"
+
+	git checkout $PROJECT-2.2.0
+
+	if [ ! -f configure ]; then
+		./autogen.sh
+	fi
+
+	./configure
+	make -j
+
+	sudo_cmd make install
+	sudo_cmd ldconfig
+
+	safe_popd
+fi
+
+if ! is_cmd pkg-config; then
+	ln -s "$(which $PROJECT)" "$INSTALL_PREFIX/bin/pkg-config"
+fi

scripts/variables.sh

@@ -1,4 +1,4 @@
-export PYTHON_VERSION=3.11
+export PYTHON_VERSION=3.12
 
 [ "$GO_VERSION" ] || export GO_VERSION=1.20
 
@@ -7,3 +7,11 @@ test "$VENV"
 
 UDEV_DEST=/usr/lib/udev/rules.d
 test $UDEV_DEST
+
+HOST_ARCH=$(uname -m)
+test "$HOST_ARCH"
+
+# Better place to declare this?
+PKG_CONFIG_PATH="/usr/lib/$HOST_ARCH-linux-gnu/pkgconfig"
+PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/share/pkgconfig"
+export PKG_CONFIG_PATH