lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

Fix MingW build

Browse Source 
Fixes bug #324857:

https://bugzilla.gnome.org/show_bug.cgi?id=324857
This commit is contained in:
Nick Wellnhofer
2016-04-30 21:00:41 +02:00
parent 1e0a2313f8
commit 52e26315b5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
win32/Makefile.mingw
View File

@ -72,6 +72,7 @@ endif
# Libxslt object files. # Libxslt object files.
XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\ XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\
$(XSLT_INTDIR)/attrvt.o\
$(XSLT_INTDIR)/documents.o\ $(XSLT_INTDIR)/documents.o\
$(XSLT_INTDIR)/extensions.o\ $(XSLT_INTDIR)/extensions.o\
$(XSLT_INTDIR)/extra.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. # Static libxslt object files.
XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\ XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\
$(XSLT_INTDIR_A)/attrvt.o\
$(XSLT_INTDIR_A)/documents.o\ $(XSLT_INTDIR_A)/documents.o\
$(XSLT_INTDIR_A)/extensions.o\ $(XSLT_INTDIR_A)/extensions.o\
$(XSLT_INTDIR_A)/extra.o\ $(XSLT_INTDIR_A)/extra.o\
@ -290,11 +292,11 @@ CFLAGS += -DLIBXML_STATIC -DLIBXSLT_STATIC -DLIBEXSLT_STATIC
APP_LDFLAGS += -Bstatic APP_LDFLAGS += -Bstatic
$(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
$(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -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 else
$(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
$(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -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 endif
# Builds xsltproc and friends. Uses the implicit rule for commands. # Builds xsltproc and friends. Uses the implicit rule for commands.

4
win32/runtests.py
View File

@ -8,7 +8,9 @@ from subprocess import Popen, PIPE
xsltproc = path.join(os.getcwd(), "win32", "bin.msvc", "xsltproc.exe") xsltproc = path.join(os.getcwd(), "win32", "bin.msvc", "xsltproc.exe")
if not path.isfile(xsltproc): 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="."): def runtests(xsl_dir, xml_dir="."):
old_dir = os.getcwd() old_dir = os.getcwd()