Mercurial > mxe-octave

changeset 4079:8f22781fe395

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ghostscript: force use of external libpng * src/ghostscript.mk: move libpng directory so it uses system libpng
author John Donoghue
date Mon, 11 Jan 2016 13:38:29 -0500
parents e5e0b3f7244b
children fc075c6c9a0b
files src/ghostscript.mk
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ghostscript.mk	Sun Jan 10 08:13:04 2016 -0500
+++ b/src/ghostscript.mk	Mon Jan 11 13:38:29 2016 -0500
@@ -32,6 +32,8 @@
     if [ "$(MXE_SYSTEM)" == "mingw" ]; then \
         rm -rf '$(1)/lcms2'; \
     fi
+    # force external libpng
+    mv '$(1)/libpng' '$(1)/libpng.x'
     cd '$(1)' && autoreconf
     cd '$(1)' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
@@ -59,6 +61,7 @@
     ifeq ($(ENABLE_WINDOWS_64),yes)
       define $(PKG)_BUILD
         mv '$(1)/freetype' '$(1)/freetype.x'
+        mv '$(1)/libpng' '$(1)/libpng.x'
         cp '$(TOP_DIR)/src/ghostscript-mingw-x86_64-makefile' '$(1)/Makefile'
         $(MAKE) -C '$(1)' TARGET='$(TARGET)' prefix='$(HOST_PREFIX)' obj/arch.h obj/gconfig_.h
         cp '$(TOP_DIR)/src/ghostscript-mingw-x86_64-arch.h' '$(1)/obj/arch.h'