Fix more misc packaging issues.

inspircd · May 3, 2024 · 6dd7b43 · 6dd7b43
1 parent 476c104
commit 6dd7b43
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/deb/platforms/debian-12.sh b/deb/platforms/debian-12.sh
@@ -19,7 +19,7 @@ declare -Ax MODULE_BUILD_DEPS=(
 	["log_syslog"]=""
 	["mysql"]="default-libmysqlclient-dev"
 	["pgsql"]="libpq-dev"
-	["regex_pcre"]="libpcre2-dev"
+	["regex_pcre"]="libpcre2-dev pkg-config"
 	["regex_posix"]=""
 	["regex_re2"]="libre2-dev pkg-config"
 	["sqlite3"]="libsqlite3-dev pkg-config"

diff --git a/deb/platforms/debian-13.sh b/deb/platforms/debian-13.sh
@@ -19,7 +19,7 @@ declare -Ax MODULE_BUILD_DEPS=(
 	["log_syslog"]=""
 	["mysql"]="default-libmysqlclient-dev"
 	["pgsql"]="libpq-dev"
-	["regex_pcre"]="libpcre2-dev"
+	["regex_pcre"]="libpcre2-dev pkg-config"
 	["regex_posix"]=""
 	["regex_re2"]="libre2-dev pkg-config"
 	["sqlite3"]="libsqlite3-dev pkg-config"

diff --git a/deb/platforms/ubuntu-22-04.sh b/deb/platforms/ubuntu-22-04.sh
@@ -19,7 +19,7 @@ declare -Ax MODULE_BUILD_DEPS=(
 	["log_syslog"]=""
 	["mysql"]="default-libmysqlclient-dev"
 	["pgsql"]="libpq-dev"
-	["regex_pcre"]="libpcre2-dev"
+	["regex_pcre"]="libpcre2-dev pkg-config"
 	["regex_posix"]=""
 	["regex_re2"]="libre2-dev pkg-config"
 	["sqlite3"]="libsqlite3-dev pkg-config"

diff --git a/deb/platforms/ubuntu-24-04.sh b/deb/platforms/ubuntu-24-04.sh
@@ -8,18 +8,20 @@ export PLATFORM_NAME="Ubuntu 24.04 (Noble Numbat)"
 export PLATFORM_CONTAINER="ubuntu:noble"
 export PLATFORM_SUFFIX="ubuntu24.04."
 
+export CORE_BUILD_DEPS="libpsl-dev pkg-config"
+export CORE_RUNTIME_DEPS="libpsl5"
+
 declare -Ax MODULE_BUILD_DEPS=(
 	["argon2"]="libargon2-dev pkg-config"
 	["geo_maxmind"]="libmaxminddb-dev pkg-config"
 	["ldap"]="libldap2-dev"
+	["log_json"]="rapidjson-dev"
+	["log_syslog"]=""
 	["mysql"]="default-libmysqlclient-dev"
 	["pgsql"]="libpq-dev"
-	["regex_pcre"]="libpcre3-dev"
-	["regex_pcre2"]="libpcre2-dev"
+	["regex_pcre"]="libpcre2-dev pkg-config"
 	["regex_posix"]=""
 	["regex_re2"]="libre2-dev pkg-config"
-	["regex_stdlib"]=""
-	["regex_tre"]="libtre-dev pkg-config"
 	["sqlite3"]="libsqlite3-dev pkg-config"
 	["ssl_gnutls"]="libgnutls28-dev pkg-config"
 	["ssl_openssl"]="libssl-dev pkg-config"
@@ -31,14 +33,13 @@ declare -Ax MODULE_RUNTIME_DEPS=(
 	["argon2"]=""
 	["geo_maxmind"]=""
 	["ldap"]=""
+	["log_json"]=""
+	["log_syslog"]=""
 	["mysql"]=""
 	["pgsql"]=""
 	["regex_pcre"]=""
-	["regex_pcre2"]=""
 	["regex_posix"]=""
 	["regex_re2"]=""
-	["regex_stdlib"]=""
-	["regex_tre"]=""
 	["sqlite3"]=""
 	["ssl_gnutls"]="gnutls-bin libio-socket-ssl-perl"
 	["ssl_openssl"]="libio-socket-ssl-perl openssl"