[WIP] Disable fPIC because __table_base and __memory_base should not be present in objects

contrib/src/openjpeg/rules.mak

@@ -23,7 +23,9 @@ ifdef HAVE_VISUALSTUDIO
 endif
 #	$(APPLY) $(SRC)/openjpeg/restrict.patch
 	$(APPLY) $(SRC)/openjpeg/install.patch
-	$(APPLY) $(SRC)/openjpeg/pic.patch
+ifndef HAVE_EMSCRIPTEN
+        $(APPLY) $(SRC)/openjpeg/pic.patch
+endif
 	$(APPLY) $(SRC)/openjpeg/openjp2_pthread.patch
 	$(call pkg_static,"./src/lib/openjp2/libopenjp2.pc.cmake.in")
 	$(MOVE)

contrib/src/zlib/rules.mak

@@ -26,6 +26,10 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 .zlib: zlib
 ifdef HAVE_WIN32
 	cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc install $(HOSTVARS) $(ZLIB_CONFIG_VARS) LD="$(CC)" INCLUDE_PATH="$(PREFIX)/include" LIBRARY_PATH="$(PREFIX)/lib" BINARY_PATH="$(PREFIX)/bin"
+endif
+ifdef HAVE_EMSCRIPTEN
+	cd $< && $(HOSTVARS) $(ZLIB_CONFIG_VARS) ./configure --prefix=$(PREFIX) --static
+	cd $< && $(MAKE) install
 else
 	cd $< && $(HOSTVARS_PIC) $(ZLIB_CONFIG_VARS) ./configure --prefix=$(PREFIX) --static
 	cd $< && $(MAKE) install