Changes in the Makefile.os4 to fully compile

localtime_r() is not available on Windows but a more-secure variant
of localtime(), localtime_s() is provided on Windows.

Define localtime_r() on Windows as its arguments are reversed as compared
to localetime_s(), to achive more or less the same purpose.

Makefile.os4

@@ -0,0 +1,35 @@
+
+USE_CLIB2=YES
+ifeq ($(USE_CLIB2), YES)
+LIBC=clib2
+else
+LIBC=newlib
+endif
+
+all: build
+
+init:
+# git submodule update --init
+	sh ./autogen.sh
+	autoreconf --install --force --symlink
+
+build: init
+	CC="ppc-amigaos-gcc" CFLAGS="-mcrt=${LIBC} -fPIC" CXXFLAGS="-mcrt=${LIBC} -fPIC" LDFlags="-mcrt=${LIBC}" LIBS="-lpthread -athread=native" ./configure --host=ppc-amigaos --enable-shared=no --enable-builtin --disable-runtime && \
+	make -j$(shell nproc)
+
+clean:
+	@make -f Makefile clean
+	@rm -rf autom4te.cache .deps
+	@rm config.log config.status configure libtool Makefile Makefile.in *.m4
+
+release:
+	@mkdir -p release/local/common/include
+	@mkdir -p release/local/clib2/lib
+#	@mkdir -p release/local/newlib/lib
+	@make -f Makefile.os4 USE_CLIB2=YES
+	@cp ./src/.libs/libpsl.a ./src/.libs/libpsl.lai ./src/libpsl.la release/local/clib2/lib/
+	@cp ./include/libpsl.h release/local/common/include/
+#	@make -f Makefile.os4 clean
+#	@make -f Makefile.os4 USE_CLIB2=NO
+#	@cp ./src/.libs/libpsl.a ./src/.libs/libpsl.lai ./src/libpsl.la release/local/newlib/lib/
+	@lha -aeq libpsl.lha release/

meson.build

@@ -40,17 +40,9 @@ if ['libidn2', 'auto'].contains(enable_runtime)
 endif
 
 if ['libicu', 'auto'].contains(enable_runtime)
-  libicu_dep = dependency('icu-uc', required : false)
+  libicu_dep = dependency('icu-uc', 'ICU',
-  if not libicu_dep.found() and cc.has_header('unicode/ustring.h')
+                          components: 'uc',
-    # MSVC: the debug configuration of ICU generated the libraries with d suffix
+                          required : false)
-    # we must handle this and search for the right library depending on the
-    # build type. Note debugoptimized is just a release build with .pdb files enabled
-    if cc.get_id() == 'msvc' and buildtype == 'debug'
-      libicu_dep = cc.find_library('icuucd', required : false)
-    else
-      libicu_dep = cc.find_library('icuuc', required : false)
-    endif
-  endif
   if libicu_dep.found()
     if enable_runtime == 'auto'
       enable_runtime = 'libicu'

tools/psl.c

@@ -38,6 +38,10 @@
 
 #ifdef _WIN32
 # include <winsock2.h> // WSAStartup, WSACleanup
+
+// Windows does not have localtime_r but has localtime_s, which is more or less
+// the same except that the arguments are reversed
+# define localtime_r(t_sec,t_now) localtime_s(t_now,t_sec)
 #endif
 
 #include <stdlib.h>