[mapguide-commits] r9275 - sandbox/jng/cmake_v2/Oem/LinuxApt

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-01-05 02:32:23 -0800 (Fri, 05 Jan 2018)
New Revision: 9275

Added:
   sandbox/jng/cmake_v2/Oem/LinuxApt/httpd-2.4.18-deps.tar.bz2
Removed:
   sandbox/jng/cmake_v2/Oem/LinuxApt/apr-1.5.2.tar.bz2
   sandbox/jng/cmake_v2/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
Modified:
   sandbox/jng/cmake_v2/Oem/LinuxApt/build_apt.sh
Log:
Get bundled httpd building. It turns out there's a httpd-deps tarball to go with the httpd one so apr and apr-util tarballs aren't required

Deleted: sandbox/jng/cmake_v2/Oem/LinuxApt/apr-1.5.2.tar.bz2
===================================================================
(Binary files differ)

Deleted: sandbox/jng/cmake_v2/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
===================================================================
(Binary files differ)

Modified: sandbox/jng/cmake_v2/Oem/LinuxApt/build_apt.sh
===================================================================
--- sandbox/jng/cmake_v2/Oem/LinuxApt/build_apt.sh	2018-01-05 08:13:34 UTC (rev 9274)
+++ sandbox/jng/cmake_v2/Oem/LinuxApt/build_apt.sh	2018-01-05 10:32:23 UTC (rev 9275)
@@ -19,8 +19,6 @@
 PHP_VER=5.6.23
 TOMCAT_VER=7.0.68
 CONNECTOR_VER=1.2.41
-APR_VER=1.5.2
-APR_UTIL_VER=1.5.4
 PORT=8008
 TOMCAT=0
 TOMCAT_PORT=8009
@@ -147,14 +145,7 @@
 #**********************************************************
 echo "Apache Httpd build started"
 tar -jxf httpd-$HTTPD_VER.tar.bz2
-if [ ! -d "httpd-$HTTPD_VER/srclib/apr" ]; then
-	tar -jxf apr-$APR_VER.tar.bz2
-	mv apr-$APR_VER httpd-$HTTPD_VER/srclib/apr
-fi
-if [ ! -d "httpd-$HTTPD_VER/srclib/aprutil" ]; then
-	tar -jxf apr-util-$APR_UTIL_VER.tar.bz2
-	mv apr-util-$APR_UTIL_VER httpd-$HTTPD_VER/srclib/apr-util
-fi
+tar -jxf httpd-$HTTPD_VER-deps.tar.bz2
 pushd httpd-$HTTPD_VER
 ./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
 --with-included-apr --with-port=$PORT

Added: sandbox/jng/cmake_v2/Oem/LinuxApt/httpd-2.4.18-deps.tar.bz2
===================================================================
(Binary files differ)


Property changes on: sandbox/jng/cmake_v2/Oem/LinuxApt/httpd-2.4.18-deps.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream