Changeset 32228 for gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

Timestamp:

2018-06-29T21:59:19+12:00 (6 years ago)

Author:

ak19

Message:

Tried to compile xpdf-tools up statically with CMake, but still not successful. For now committing modifications necessary (including the new additional packages) for compiling xpdf-tools agains dynamically linked libs of libpng and zlib and freetype. Although these 3 packages have been introduced and are successfully compiled up (and I can even get the CMake configure stage of xpdf-tools to 'see' them), the xpdftools binaries upon successful compilation are shown by ldd to still refer to system versions of zlib, libpng and freetype. Some modifications to a single file in the xpdftools src package were necessary to get things to compile again with these changes, so recommitting the xpdftools src package with modications using the usual gs- prefix and a readme.

File:

• gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh (modified) (1 diff)

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

@@ -32 +32 @@
 
 # Only compile if necessary - we don't edit these source files.
-if type -p cmake; then
-  echo "found cmake in PATH"
-  _CMAKE=cmake
-elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
-##if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
+#if type -p cmake; then
+#  echo "found cmake in PATH"
+#  _CMAKE=cmake
+#elif [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
+# NO. Rather, only compile up OUR cmake if we haven't already got OUR cmake
+# But don't use any system cmake: xpdf-tools is dependent on cmake version (>= 2.8.8)
+if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
   echo "found cmake in $GEXTXPDFTOOLS_INSTALLED/linux/bin"
   _CMAKE="$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake"