Fix sasl-xoauth2 alpine build error: basename was not declared

bokysan · Sep 13, 2022 · 075a99f · 075a99f
1 parent 38d767c
commit 075a99f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/build-scripts/sasl-build.sh b/build-scripts/sasl-build.sh
@@ -7,6 +7,7 @@ do_build() {
     mkdir build
     cd build
     if [ -f /etc/alpine-release ]; then
+        patch -p1 -d .. < /build-scripts/sasl-xoauth2.diff
         cmake -DCMAKE_INSTALL_PREFIX=/ ..
     else
         cmake -DCMAKE_INSTALL_PREFIX=/usr ..
@@ -18,7 +19,7 @@ do_build() {
 }
 
 if [ -f /etc/alpine-release ]; then
-    apk add --upgrade --virtual .build-deps git cmake clang make gcc g++ libc-dev pkgconfig curl-dev jsoncpp-dev cyrus-sasl-dev
+    apk add --upgrade --virtual .build-deps git cmake clang make gcc g++ libc-dev pkgconfig curl-dev jsoncpp-dev cyrus-sasl-dev patch
     do_build
     apk del .build-deps;
 else

diff --git a/build-scripts/sasl-xoauth2.diff b/build-scripts/sasl-xoauth2.diff
@@ -0,0 +1,10 @@
+--- a/src/test_config.cc	2022-09-06 21:21:10.600553457 +0200
++++ b/src/test_config.cc	2022-09-06 21:21:42.736614599 +0200
+@@ -1,6 +1,7 @@
+ #include <getopt.h>
+ #include <sasl/sasl.h>
+ #include <string.h>
++#include <libgen.h>
+
+ #include "config.h"
+ #include "log.h"