fix gdal cmake tests (again)

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
        BUILDS: 3.12 3.13 3.14
-       EMFLAVOUR: latest
+       EMFLAVOUR: tot
 
     steps:
     - uses: actions/checkout@v3.3.0

emsdk-cc

@@ -139,7 +139,7 @@ for argc, arg in enumerate(sys.argv):
         SKIP = True
         break
 
-    if arg.startswith("CMakeFiles/"):
+    if arg.startswith("CMakeFiles/") or arg.startswith("@CMakeFiles/"):
         CMAKE = True
 
     if arg.startswith("--preload-file") or arg.startswith("--embed-file"):
@@ -152,6 +152,10 @@ for argc, arg in enumerate(sys.argv):
         EXE = False
         HTML = True
 
+    # only html may not exit runtime.
+    if not HTML and arg.find("EXIT_RUNTIME") > 0:
+        continue
+
     if arg.lower() in ("-fpic", "-latomic"):
         continue
 
@@ -256,25 +260,27 @@ if SKIP:
     final.extend(sys.argv)
 else:
     if AOUT:
+        if CMAKE or CONFIGURE:
+            EXE = False
         # should not happen
-        if AOUT.endswith(".o") and "-c" not in out:
+        elif AOUT.endswith(".o") and "-c" not in out:
             final.append("-c")
             EXE = False
             MAIN_MODULE = False
         elif AOUT.endswith(".html"):
             MAIN_MODULE = True
             EXE = False
             HTML = True
-
         # emscripten aware build
         elif AOUT.endswith(".cjs") or AOUT.endswith(".js"):
             MAIN_MODULE = True
             EXE = True
-        # a.out, could be a standalone from config/cmake
-        elif not CONFIGURE and not CMAKE and "-c" not in out:
+        # a.out case
+        elif "-c" not in out:
             EXE = True
         else:
             EXE = False
+
     if EXE:
         if AOUT.endswith(".cjs") or AOUT.endswith(".js"):
 

sources.extra/2000-microwindows.sh

@@ -26,7 +26,7 @@ else
 fi
 
 
-if [ -f $PREFIX/lib/libX11.a ]
+if [ -f $PREFIX/lib/libNX11.a ]
 then
     echo "
         already built in $PREFIX/lib/libX11.a