[mapguide-commits] r9472 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-02-03 02:27:04 -0800 (Sun, 03 Feb 2019)
New Revision: 9472

Modified:
   trunk/MgDev/cmake_bootstrap.sh
Log:
CMake: Get internal gd to build against internal libpng

Modified: trunk/MgDev/cmake_bootstrap.sh
===================================================================
--- trunk/MgDev/cmake_bootstrap.sh	2019-01-25 15:51:45 UTC (rev 9471)
+++ trunk/MgDev/cmake_bootstrap.sh	2019-02-03 10:27:04 UTC (rev 9472)
@@ -284,10 +284,15 @@
     cp -Rf "${SOURCE_DIR}/Oem/gd/gd" "${OEM_WORK_DIR}/gd/gd"
     cd "${OEM_WORK_DIR}/gd/gd" || exit
     if [ $BUILD_CPU -eq 64 ]; then
+        echo "Running gd configure with: --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-jpeg=${PHP_JPEG_DIR} --with-png=${PHP_PNG_DIR} --with-freetype=${PHP_FREETYPE_DIR} --with-pic --prefix=${OEM_INSTALL_STAGE}/gd"
         sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-jpeg="${PHP_JPEG_DIR}" --with-png="${PHP_PNG_DIR}" --with-freetype="${PHP_FREETYPE_DIR}" --with-pic --prefix="${OEM_INSTALL_STAGE}/gd"
     else
+        echo "Running gd configure with: --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-jpeg=${PHP_JPEG_DIR} --with-png=${PHP_PNG_DIR} --with-freetype=${PHP_FREETYPE_DIR} --prefix=${OEM_INSTALL_STAGE}/gd"
         sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-jpeg="${PHP_JPEG_DIR}" --with-png="${PHP_PNG_DIR}" --with-freetype="${PHP_FREETYPE_DIR}" --prefix="${OEM_INSTALL_STAGE}/gd"
     fi
+    #--with-png does not add the libpng include path to CPPFLAGS (???)
+    #So sed patch this path in
+    sed -i "s|^CPPFLAGS =|CPPFLAGS = -I$PHP_PNG_DIR/include/libpng |g" Makefile
     make && make install
     check_build
 fi