Merge pull request #95 from fledge-iot/FOGL-8538B

FOGL-8538 - Reverted old way of libexpat compilation

Author: ashish-jabble

.gitignore

@@ -16,7 +16,7 @@ others/jansson
 others/lib60870
 others/libiec61850
 others/S2OPC
-others/expat-2.6.0
+others/libexpat
 others/check-0.15.2
 others/mbedtls-2.28.7
 others/*.tar.gz

others/scripts/s2opcua/requirements.sh

@@ -48,15 +48,14 @@ fi
 # libexpat:
 cd ${git_root}
 libexpat_version="2.6.0"
-rm -rf expat-${libexpat_version}.tar.gz expat-${libexpat_version}
-wget https://github.com/libexpat/libexpat/releases/download/R_2_6_0/expat-${libexpat_version}.tar.gz
-tar xzvf expat-${libexpat_version}.tar.gz
+libexpat_branch="R_${libexpat_version//./_}"
+rm -rf libexpat
+git clone https://github.com/libexpat/libexpat.git --branch ${libexpat_branch} --depth 1
 (
-	cd expat-${libexpat_version}
-	mkdir build
-	cd build
-	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DEXPAT_SHARED_LIBS=ON ..
-	make
+	cd libexpat/expat
+	./buildconf.sh && \
+	./configure && \
+	make && \
 	sudo make install
 )