[libxslt] Fix MingW build



commit 52e26315b5336f39a6c346a1d0e1595f84253b13
Author: Nick Wellnhofer <wellnhofer aevum de>
Date:   Sat Apr 30 21:00:41 2016 +0200

    Fix MingW build
    
    Fixes bug #324857:
    
    https://bugzilla.gnome.org/show_bug.cgi?id=324857

 win32/Makefile.mingw |    6 ++++--
 win32/runtests.py    |    4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index 946ffa3..5b102b3 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -72,6 +72,7 @@ endif
 
 # Libxslt object files.
 XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\
+       $(XSLT_INTDIR)/attrvt.o\
        $(XSLT_INTDIR)/documents.o\
        $(XSLT_INTDIR)/extensions.o\
        $(XSLT_INTDIR)/extra.o\
@@ -93,6 +94,7 @@ XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR),$(XSLT_SRCDIR),$(XSLT_OBJS)))
 
 # Static libxslt object files.
 XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\
+       $(XSLT_INTDIR_A)/attrvt.o\
        $(XSLT_INTDIR_A)/documents.o\
        $(XSLT_INTDIR_A)/extensions.o\
        $(XSLT_INTDIR_A)/extra.o\
@@ -290,11 +292,11 @@ CFLAGS += -DLIBXML_STATIC -DLIBXSLT_STATIC -DLIBEXSLT_STATIC
 APP_LDFLAGS += -Bstatic
 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
        $(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
-       $(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F))
+       $(LD) $(APP_LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) $(APPLIBS)
 else
 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c 
        $(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $< 
-       $(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) 
+       $(LD) $(APP_LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) $(APPLIBS)
 endif
 
 # Builds xsltproc and friends. Uses the implicit rule for commands.
diff --git a/win32/runtests.py b/win32/runtests.py
index cdd7f1e..4d9aabb 100644
--- a/win32/runtests.py
+++ b/win32/runtests.py
@@ -8,7 +8,9 @@ from subprocess import Popen, PIPE
 
 xsltproc = path.join(os.getcwd(), "win32", "bin.msvc", "xsltproc.exe")
 if not path.isfile(xsltproc):
-    raise FileNotFoundError(xsltproc)
+    xsltproc = path.join(os.getcwd(), "win32", "bin.mingw", "xsltproc.exe")
+    if not path.isfile(xsltproc):
+        raise FileNotFoundError(xsltproc)
 
 def runtests(xsl_dir, xml_dir="."):
     old_dir = os.getcwd()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]