From c86601e2a7fa9045a7fe57d5ea665db188b3800b Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Wed, 1 May 2024 09:47:51 -0400
Subject: [PATCH] extra/erlang-nox to 26.2.4-1

---
 extra/erlang-nox/.SRCINFO |  5 ++---
 extra/erlang-nox/PKGBUILD | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/extra/erlang-nox/.SRCINFO b/extra/erlang-nox/.SRCINFO
index ff295fe4b..e74b9c972 100644
--- a/extra/erlang-nox/.SRCINFO
+++ b/extra/erlang-nox/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = erlang-nox
 	pkgdesc = General-purpose concurrent functional programming language (headless version)
-	pkgver = 26.2.3
+	pkgver = 26.2.4
 	pkgrel = 1
 	url = https://erlang.org/
 	arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = erlang-nox
 	makedepends = unixodbc
 	depends = ncurses
 	depends = openssl
-	optdepends = erlang-unixodbc: database support
 	optdepends = java-environment: for Java support
 	optdepends = lksctp-tools: for SCTP support
 	conflicts = erlang
@@ -22,7 +21,7 @@ pkgbase = erlang-nox
 	source = epmd.service
 	source = epmd.socket
 	source = https://erlang.org//download/otp_doc_man_26.1.tar.gz
-	source = git+https://github.com/erlang/otp#commit=928d03e6da416208fce7b9a7dbbfbb4f25d26c37
+	source = git+https://github.com/erlang/otp#commit=e26c5206dc98ec1b8f978fceaa61fd1354266ccb
 	b2sums = 1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cdc0428707f744dee5940b12653a44e0ded0554de95ebb31bce4676ff87
 	b2sums = 1f765318bcd322ce697a48c064ccdb1bd107b4a84e164a87f62678391cb82a9ab17a397d679cf266e037a5a2d91772b85f7a97f9cc5478c0f18118743b30045f
 	b2sums = c37706f5f6e2d49100104fb442ebf15edd6ee0a1e8038d0364794cf34fd3f02a61b9ad2706228b3327b85b0cadcd11aac6087e7c98408eae2d307a09191b6553
diff --git a/extra/erlang-nox/PKGBUILD b/extra/erlang-nox/PKGBUILD
index acb656047..882dd1354 100644
--- a/extra/erlang-nox/PKGBUILD
+++ b/extra/erlang-nox/PKGBUILD
@@ -9,11 +9,11 @@
 #  - configure with --disable-pgo to fix ARM FTBFS
 
 pkgname=erlang-nox
-pkgver=26.2.3
+pkgver=26.2.4
 pkgrel=1
 _docver=26.1
 # https://github.com/erlang/otp/tags
-_commit=928d03e6da416208fce7b9a7dbbfbb4f25d26c37 # OTP-26.2.3
+_commit=e26c5206dc98ec1b8f978fceaa61fd1354266ccb # OTP-26.2.4
 arch=(x86_64)
 pkgdesc='General-purpose concurrent functional programming language (headless version)'
 url='https://erlang.org/'
@@ -21,8 +21,7 @@ license=(Apache)
 depends=(ncurses openssl)
 makedepends=(fop git java-environment libxslt lksctp-tools unixodbc)
 conflicts=(erlang)
-optdepends=('erlang-unixodbc: database support'
-            'java-environment: for Java support'
+optdepends=('java-environment: for Java support'
             'lksctp-tools: for SCTP support')
 options=(staticlibs)
 source=(epmd.conf
@@ -38,7 +37,7 @@ b2sums=('1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cd
 
 prepare() {
   # adjust how LDFLAGS are handled
-  sed -i 's/^LDFLAGS = /LDFLAGS += /g' otp/lib/{odbc/c_src,megaco/src/flex}/Makefile.in
+  sed -i 's/^LDFLAGS = /LDFLAGS += /g' otp/lib/megaco/src/flex/Makefile.in
 
   # let the Java bindings support version 11 or later, ref https://gitlab.archlinux.org/archlinux/packaging/packages/erlang/-/issues/1
   sed -i 's/^JAVA_OPTIONS =/JAVA_OPTIONS = --release 11/g' otp/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -53,7 +52,7 @@ build() {
     --enable-shared-zlib \
     --enable-ssl=dynamic-ssl-lib \
     --prefix=/usr \
-    --with-odbc \
+    --without-odbc \
     --disable-pgo
   DOC_TARGETS=chunks make all
   DOC_TARGETS=chunks make docs