Add support for libmagic.

languages/scm.sh

@@ -30,11 +30,7 @@ compile_payload_scm()
     scm_coresrcs=
     scm_auxsrcs=
     for m in $modules; do
-      if [ $m = "syntax-case" ]; then
-        scm_modsrc="$SYS_HOSTPREFIX/lib/syntax-case.scm"
-      else
-        scm_modsrc=`locatefile modules/$m/$m.scm silent`
-      fi
+      scm_modsrc=`locatefile modules/$m/$m.scm silent`
       if [ `string_contains "$scm_coremodules" " $m "` = yes ]; then
         scm_coresrcs="$scm_coresrcs $scm_modsrc"
       else
@@ -56,6 +52,7 @@ compile_payload_scm()
     else
       scm_opts="(declare (block)(not safe)(standard-bindings)(extended-bindings))"
     fi
+    scm_opts="${scm_opts}(define-cond-expand-feature $SYS_PLATFORM)"
     # support global macro definitions
     if [ -f "${SYS_HOSTPREFIX}/lib/global-macros.scm" ]; then
       scm_opts="${scm_opts}(include \\\"~~lib/global-macros.scm\\\")"
@@ -65,19 +62,6 @@ compile_payload_scm()
        payload_cdefs="$payload_cdefs -DSTANDALONE"
     fi
     #--------
-    # syntax-case special-case
-    if [ `string_contains "$modules" "syntax-case"` = yes ]; then
-      if [ ! -f ${SYS_HOSTPREFIX}/lib/gambcext.tmp ]; then
-        echo " => compiling syntax-case dynamic library.."
-        veval "$SYS_GSC -dynamic -o  ${SYS_HOSTPREFIX}/lib/gambcext.o1 ${SYS_HOSTPREFIX}/lib/syntax-case.scm"
-        mv ${SYS_HOSTPREFIX}/lib/gambcext.o1 ${SYS_HOSTPREFIX}/lib/gambcext.tmp
-      fi
-      assertfile ${SYS_HOSTPREFIX}/lib/gambcext.tmp
-      cp ${SYS_HOSTPREFIX}/lib/gambcext.tmp ${SYS_HOSTPREFIX}/lib/gambcext.o1
-    else
-      rmifexists ${SYS_HOSTPREFIX}/lib/gambcext.o1
-    fi
-    #--------
     # compile scheme source files
     mkdir -p "$SYS_PREFIX/build"
     scm_csrcs=

libraries/libgd/make.sh

@@ -8,7 +8,7 @@ EXTRACONF=
 if [ ! $SYS_PLATFORM = $SYS_HOSTPLATFORM ]; then
   EXTRACONF=--host=$SYS_ARCH
 fi
-if [ $SYS_PLATFORM = android ]; then
+if [ $SYS_PLATFORM = android -o  $SYS_PLATFORM = win32 ]; then
   EXTRACONF="$EXTRACONF --without-vpx"
 fi
 

libraries/libmagic/LIB_DEPENDS

@@ -0,0 +1 @@
+libpcre

libraries/libmagic/make.sh

@@ -0,0 +1,76 @@
+PKGURL=https://github.com/threatstack/libmagic/archive/5.18.tar.gz
+PKGHASH=ce734a1cc24bddbfd8b21f4ffdfe721ab74eeed9
+
+package_download $PKGURL $PKGHASH
+package_patch
+
+EXTRACONF=
+
+if [ "$SYS_PLATFORM" != "$SYS_HOSTPLATFORM" ]; then
+    EXTRACONF="$EXTRACONF --host=$SYS_ARCH"
+fi
+
+# pretend libgnurx exists by masking libpcre
+
+test -L $SYS_PREFIX/include/regex.h || ln -s pcreposix.h $SYS_PREFIX/include/regex.h
+
+# Mabye instead of fooling the package, it should be patched
+rmifexists $SYS_PREFIX/lib/libgnurx.a
+rmifexists $SYS_PREFIX/lib/libgnurx
+mkdir $SYS_PREFIX/lib/libgnurx
+( cd $SYS_PREFIX/lib/libgnurx
+  mkdir a
+  cd a
+  $SYS_AR -x ../../libpcre.a
+  cd ..
+  mkdir b
+  cd b
+  $SYS_AR -x ../../libpcreposix.a
+  cd ..
+  $SYS_AR rc ../libgnurx.a a/*.o b/*.o
+)
+
+rm -r $SYS_PREFIX/lib/libgnurx
+
+if [ `file --version|head -1` != file-5.18 ]; then
+    if [ ! -f  $SYS_HOSTPREFIX/bin/file ]; then
+	./configure --enable-static --disable-shared 'CFLAGS=-fPIC -O3 -DPCRE_STATIC'
+	package_make
+	cp src/file $SYS_HOSTPREFIX/bin || exit 1
+	package_cleanup
+	package_download $PKGURL $PKGHASH
+	package_patch
+    fi
+    FILE_COMPILE=$SYS_HOSTPREFIX/bin/file
+fi
+
+# configure
+
+if [ "$SYS_PLATFORM" != "$SYS_HOSTPLATFORM" -a "X$FILE_COMPILE" != "X" ]; then
+    echo patching magic/Makefile.in to use $FILE_COMPILE
+    sed -i -es%'@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}'%"@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = ${FILE_COMPILE}"% magic/Makefile.in
+fi
+
+package_configure --enable-static --disable-shared $EXTRACONF "'CFLAGS=-fPIC -O3 -DPCRE_STATIC -DNOSHLWAPI'"
+
+
+# build
+
+package_make
+
+# install
+
+cp src/.libs/libmagic.a $SYS_PREFIX/lib
+cp src/magic.h $SYS_PREFIX/include
+test -f src/file.exe && cp src/file.exe $SYS_PREFIX/bin
+test -d $SYS_PREFIX/etc || mkdir $SYS_PREFIX/etc
+cp magic/magic.mgc $SYS_PREFIX/etc
+
+#  Cleanup the fooling
+rm -f $SYS_PREFIX/lib/libgnurx.a $SYS_PREFIX/include/regex.h
+
+package_cleanup
+
+unset EXTRACONF
+
+#eof

libraries/libmagic/no_use_PathRemoveFileSpecA.patch

@@ -0,0 +1,20 @@
+--- src/magic.original.c	2014-08-28 17:53:19.000000000 +0200
++++ src/magic.c	2019-08-07 17:56:04.790561769 +0200
+@@ -175,7 +175,16 @@
+ 	LPTSTR dllpath = malloc(sizeof(*dllpath) * (MAX_PATH + 1));
+ 	dllpath[MAX_PATH] = 0;	/* just in case long path gets truncated and not null terminated */
+ 	if (GetModuleFileNameA(NULL, dllpath, MAX_PATH)){
+-		PathRemoveFileSpecA(dllpath);
++                // PathRemoveFileSpecA(dllpath);
++                {
++                  // PathRemoveFileSpecA is not avail on mingw
++                  int i = strlen(dllpath);
++                  while(i>0) {
++                    if(dllpath[i] == '\\') break;
++                    dllpath[i--] = '\0';
++                  }
++                  dllpath[i] = '\0';
++                }
+ 		if (strlen(dllpath) > 3 &&
+ 		    stricmp(&dllpath[strlen(dllpath) - 3], "bin") == 0) {
+ 			if (asprintf(&tmppath,

libraries/libpcre/make.sh

@@ -0,0 +1,36 @@
+PKGURL=https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.gz
+PKGHASH=8f36ed69d3e938972fc511c19bfaa0ff27ff1d71
+
+package_download $PKGURL $PKGHASH
+
+package_patch
+
+EXTRACONF="--enable-utf --enable-jit "
+
+if [ "$SYS_PLATFORM" != "$SYS_HOSTPLATFORM" ]; then
+    EXTRACONF="$EXTRACONF --host=$SYS_ARCH"
+fi
+
+# configure
+
+lncc=`echo $SYS_CC| cut -d ' ' -f 1`
+case $lncc in
+     *clang) deflncxx="CXX=${lncc}++" ;;
+esac
+package_configure $EXTRACONF "CC=$lncc $deflncxx"
+
+# build
+
+NOQUIET=yes package_make
+
+# install
+
+cp .libs/libpcre.a .libs/libpcreposix.a $SYS_PREFIX/lib || exit 1
+cp pcre.h pcreposix.h pcrecpparg.h pcre_scanner.h pcre_stringpiece.h $SYS_PREFIX/include || exit 1
+
+package_cleanup
+
+unsset deflncxx
+unset EXTRACONF
+
+#eof