Mercurial > mxe-octave

changeset 3546:763df540d5d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fontconfig: Use cp for mingw cross build * src/mingw-fontconfig-ln_s.patch: New patch file. * dist-files.mk: add mingw-fontconfig-ln_s.patch.
author John Donoghue <john.donoghue@ieee.org>
date Sat, 22 Feb 2014 21:09:17 -0500
parents c21ca79d7980
children 7753f2df29f0
files dist-files.mk src/mingw-fontconfig-ln_s.patch
diffstat 2 files changed, 31 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Feb 20 14:48:42 2014 -0500
+++ b/dist-files.mk	Sat Feb 22 21:09:17 2014 -0500
@@ -291,6 +291,7 @@
   mdbtools.mk \
   mingw-cairo-1-ssize-t-defined.patch \
   mingw-cfitsio-1-fixes.patch \
+  mingw-fontconfig-ln_s.patch \
   mingw-glib-1-fixes.patch \
   mingw-glib-2-fixes.patch \
   mingw-hdf5-1.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-fontconfig-ln_s.patch	Sat Feb 22 21:09:17 2014 -0500
@@ -0,0 +1,30 @@
+diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
+--- fontconfig-2.11.0.orig/conf.d/Makefile.am	2014-02-22 20:53:48.000000000 -0500
++++ fontconfig-2.11.0/conf.d/Makefile.am	2014-02-22 20:59:45.000000000 -0500
+@@ -88,9 +88,9 @@
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+ 	  cd $(DESTDIR)$(configdir);				\
+ 	  for i in $(CONF_LINKS); do				\
+-	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
++	    echo $(RM) $$i";" cp $(DESTDIR)$(templatedir)/$$i .;	\
+ 	    $(RM) $$i;						\
+-	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;		\
++	    cp $(DESTDIR)$(templatedir)/$$i .;		\
+ 	  done)
+ uninstall-local:
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
+--- fontconfig-2.11.0.orig/conf.d/Makefile.in	2014-02-22 20:53:48.000000000 -0500
++++ fontconfig-2.11.0/conf.d/Makefile.in	2014-02-22 21:01:04.000000000 -0500
+@@ -632,9 +632,9 @@
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+ 	  cd $(DESTDIR)$(configdir);				\
+ 	  for i in $(CONF_LINKS); do				\
+-	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
++	    echo $(RM) $$i";" cp $(DESTDIR)$(templatedir)/$$i .;	\
+ 	    $(RM) $$i;						\
+-	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;				\
++	    cp $(DESTDIR)$(templatedir)/$$i .;				\
+ 	  done)
+ uninstall-local:
+ 	@(echo cd $(DESTDIR)$(configdir);			\