Updates - Fix armv6 missing, emscripten svgtiny fix, downloader fix l…

…ibxml2 (#467)

* Still supporting armv6

* svgtiny cause emscripten

* libxml2 fix download

* downloader [4.3.1 -> 4.3.4] - fixes for remote mb hang ups and issues

apothecary/apothecary

@@ -842,7 +842,7 @@ if [ "$TYPE" = "emscripten" ]; then
     else
         PTHREADS_FLAG=""
     fi
-    export FLAG_RELEASE+="-Os ${PTHREADS_FLAG} -fPIC ${PLATFORM_FLAG} -fvisibility=hidden -Wno-implicit-function-declaration -frtti -DWASM=ON -DNDEBUG "
+    export FLAG_RELEASE+="-O3 ${PTHREADS_FLAG} -fPIC ${PLATFORM_FLAG} -fvisibility=hidden -Wno-implicit-function-declaration -frtti -DWASM=ON -DNDEBUG "
 	EMSCRIPTEN_SCRIPT="$(realpath "$APOTHECARY_DIR/../scripts/emscripten/setup.sh")"
 	. "$EMSCRIPTEN_SCRIPT"
 fi
@@ -942,6 +942,8 @@ if [ "$TYPE" == "linux" ] || [ "$TYPE" == "linux64" ] || [ "$TYPE" == "linuxaarc
         export ABI="aarch64"
     elif [ $TYPE == "linuxarmv7l" ]; then
         export ABI="armv7l"
+    elif [ $TYPE == "linuxarmv6l" ]; then
+        export ABI="armv6l"
     elif [ $TYPE == "msys2" ]; then
         export ABI="x86_64"
     fi 

apothecary/formulas/libxml2/libxml2.sh

@@ -63,11 +63,11 @@ function prepare() {
         cp -fr $FORMULA_DIR/glob.h .
     fi
 
-    apothecaryDependencies download
+    # apothecaryDependencies download
 
-    apothecaryDepend prepare zlib
-    apothecaryDepend build zlib
-    apothecaryDepend copy zlib
+    # apothecaryDepend prepare zlib
+    # apothecaryDepend build zlib
+    # apothecaryDepend copy zlib
 
     rm -f ./CMakeLists.txt
     cp -v $FORMULA_DIR/CMakeLists.txt ./CMakeLists.txt
@@ -240,8 +240,8 @@ function build() {
         find . -name "test*.c" | xargs -r rm
         find . -name "run*.c" | xargs -r rm
         . "$DOWNLOADER_SCRIPT"
-        downloader "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
-        downloader "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+        downloader "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" "config.guess"
+        downloader "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" "config.sub"
         ZLIB_ROOT="$LIBS_ROOT/zlib/"
         ZLIB_INCLUDE_DIR="$LIBS_ROOT/zlib/include"
         ZLIB_LIBRARY="$LIBS_ROOT/zlib/lib/$TYPE/$PLATFORM/zlib.a"

apothecary/formulas/svgtiny/CMakeLists.txt

@@ -57,24 +57,6 @@ include_directories(
 add_library(svgtiny STATIC ${SRC_FILES})
 target_link_libraries(svgtiny dom wapcaplet expat m ${LIBXML2_LIBRARY})
 
-if(EMSCRIPTEN)
-    add_executable(svgtiny_wasm ${SRC_FILES})
-    target_include_directories(svgtiny_wasm PRIVATE 
-    ${LIBXML2_INCLUDE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/libdom/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/libdom/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/libdom/bindings
-    ${CMAKE_CURRENT_SOURCE_DIR}/libwapcaplet/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/libparserutils/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/libparserutils/src)
-    target_link_libraries(svgtiny_wasm ${LIBXML2_LIBRARY} m)
-    set_target_properties(svgtiny_wasm PROPERTIES COMPILE_FLAGS " -fPIC -s SIDE_MODULE=1 ")
-    set_target_properties(svgtiny_wasm PROPERTIES LINK_FLAGS    "-fPIC -s WASM=1 -s SIDE_MODULE=1 -s STANDALONE_WASM --no-entry")
-    set(CMAKE_EXECUTABLE_SUFFIX ".a")
-endif()
-
 if(DO_XML_INSTALL)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libdom/bindings/xml/xmlerror.h ${CMAKE_CURRENT_SOURCE_DIR}/libdom/bindings/xml/xmlparser.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 endif()