Merge branch 'build-fixes'

* Branch commit log: ase/logging.cc: add missing unistd.h include package.json: add missing "globals" package (for eslint) ase/*.cc: fix missing <algorithm> include ase/*.hh: fix missing <algorithm> include misc/cirun: use $CITAG, instead of hard coding dist Signed-off-by: Tim Janik <[email protected]>
tim-janik · May 21, 2024 · 998d089 · 998d089
2 parents f4a6e2d + 903979f
commit 998d089
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 1 deletion.
diff --git a/ase/callback.hh b/ase/callback.hh
@@ -3,6 +3,7 @@
 #define __ASE_CALLBACK_HH__
 
 #include <ase/defs.hh>
+#include <algorithm>
 
 namespace Ase {
 

diff --git a/ase/driver.cc b/ase/driver.cc
@@ -4,6 +4,7 @@
 #include "platform.hh"
 #include "datautils.hh"
 #include "internal.hh"
+#include <algorithm>
 
 #define DDEBUG(...)     Ase::debug ("driver", __VA_ARGS__)
 

diff --git a/ase/eventlist.hh b/ase/eventlist.hh
@@ -3,6 +3,7 @@
 #define __ASE_EVENTLIST_HH__
 
 #include <ase/utils.hh>
+#include <algorithm>
 #include <any>
 
 namespace Ase {

diff --git a/ase/logging.cc b/ase/logging.cc
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/stat.h>
 
 namespace Ase {

diff --git a/ase/memory.cc b/ase/memory.cc
@@ -4,6 +4,7 @@
 #include <ase/testing.hh>
 #include <sys/mman.h>
 #include <unistd.h>     // _SC_PAGESIZE
+#include <algorithm>
 #include <shared_mutex>
 #include <atomic>
 

diff --git a/ase/path.cc b/ase/path.cc
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <algorithm>
 #include <cstring>      // strchr
 #include <glob.h>       // glob
 #include <mutex>

diff --git a/ase/platform.cc b/ase/platform.cc
@@ -20,6 +20,7 @@
 #include <stdarg.h>
 #include <sys/types.h>
 #include <pwd.h>                // getpwuid_r
+#include <algorithm>
 
 #if defined __APPLE__
 #include <mach-o/dyld.h>        // _NSGetExecutablePath

diff --git a/ase/sortnet.hh b/ase/sortnet.hh
@@ -3,6 +3,7 @@
 #define __ASE_SORTNET_HH__
 
 #include <functional>
+#include <algorithm>
 
 namespace Ase {
 

diff --git a/ase/strings.cc b/ase/strings.cc
@@ -7,6 +7,7 @@
 #include <libintl.h>
 #include <iconv.h>
 #include <errno.h>
+#include <algorithm>
 
 #include <glib.h>       // g_unichar_*
 

diff --git a/misc/cirun b/misc/cirun
@@ -36,7 +36,7 @@ while test $# -ne 0 ; do
 done
 
 # Check for existing docker image
-if $FORCE_BUILD || ! docker image inspect --format=1 cirun:focal >/dev/null 2>&1; then
+if $FORCE_BUILD || ! docker image inspect --format=1 cirun:$CITAG >/dev/null 2>&1; then
   # Utilize $CICACHE when present
   CACHETYPE=
   if test -n "${CICACHE:-}" ; then

diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vue": "^9.25.0",
     "fork-awesome": "^1.2.0",
+    "globals": "^15.3.0",
     "icon-gen": "^4.0.0",
     "jsdoc": "^4.0.3",
     "jsdoc-api": "^8.0.0",