Attachment 'libxslt-msys.patch'
Download 1 diff -ruN libxslt-1.1.24/win32/Makefile.mingw libxslt-1.1.24-fixed/win32/Makefile.mingw
2 --- libxslt-1.1.24/win32/Makefile.mingw Wed Jan 3 15:11:58 2007
3 +++ libxslt-1.1.24-fixed/win32/Makefile.mingw Tue May 20 22:08:16 2008
4 @@ -19,9 +19,9 @@
5 # ----------------------------------------------------------------
6
7 BASEDIR = ..
8 -XSLT_SRCDIR = $(BASEDIR)\libxslt
9 -EXSLT_SRCDIR = $(BASEDIR)\libexslt
10 -UTILS_SRCDIR = $(BASEDIR)\xsltproc
11 +XSLT_SRCDIR = $(BASEDIR)/libxslt
12 +EXSLT_SRCDIR = $(BASEDIR)/libexslt
13 +UTILS_SRCDIR = $(BASEDIR)/xsltproc
14 BINDIR = bin.mingw
15
16 # Names of various input and output components.
17 @@ -50,11 +50,11 @@
18 # The compiler and its options.
19 CC = gcc.exe
20 CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS
21 -CFLAGS += -I$(BASEDIR) -I$(XSLT_SRCDIR) -I$(INCPREFIX)
22 +CFLAGS += -I$(BASEDIR) -I$(XSLT_SRCDIR) -I$(INCPREFIX) -I$(INCLUDE)
23
24 # The linker and its options.
25 LD = gcc.exe
26 -LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX)
27 +LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX) -Wl,-L,$(LIB)
28 LIBS = -lwsock32
29
30 # The archiver and its options.
31 @@ -71,7 +71,8 @@
32 endif
33
34 # Libxslt object files.
35 -XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\
36 +XSLT_OBJS = $(XSLT_INTDIR)/attrvt.o\
37 + $(XSLT_INTDIR)/attributes.o\
38 $(XSLT_INTDIR)/documents.o\
39 $(XSLT_INTDIR)/extensions.o\
40 $(XSLT_INTDIR)/extra.o\
41 @@ -91,7 +92,8 @@
42 XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR),$(XSLT_SRCDIR),$(XSLT_OBJS)))
43
44 # Static libxslt object files.
45 -XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\
46 +XSLT_OBJS_A = $(XSLT_INTDIR)/attrvt.o\
47 + $(XSLT_INTDIR_A)/attributes.o\
48 $(XSLT_INTDIR_A)/documents.o\
49 $(XSLT_INTDIR_A)/extensions.o\
50 $(XSLT_INTDIR_A)/extra.o\
51 @@ -140,48 +142,46 @@
52
53 all : dep libxslt libxslta libexslt libexslta utils
54
55 -libxslt : $(BINDIR)\$(XSLT_SO)
56 +libxslt : $(BINDIR)/$(XSLT_SO)
57
58 -libxslta : $(BINDIR)\$(XSLT_A)
59 +libxslta : $(BINDIR)/$(XSLT_A)
60
61 -libexslt : $(BINDIR)\$(EXSLT_SO)
62 +libexslt : $(BINDIR)/$(EXSLT_SO)
63
64 -libexslta : $(BINDIR)\$(EXSLT_A)
65 +libexslta : $(BINDIR)/$(EXSLT_A)
66
67 utils : $(UTILS)
68
69 clean :
70 - cmd.exe /C if exist $(XSLT_INTDIR) rmdir /S /Q $(XSLT_INTDIR)
71 - cmd.exe /C if exist $(XSLT_INTDIR_A) rmdir /S /Q $(XSLT_INTDIR_A)
72 - cmd.exe /C if exist $(EXSLT_INTDIR) rmdir /S /Q $(EXSLT_INTDIR)
73 - cmd.exe /C if exist $(EXSLT_INTDIR_A) rmdir /S /Q $(EXSLT_INTDIR_A)
74 - cmd.exe /C if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)
75 - cmd.exe /C if exist $(BINDIR) rmdir /S /Q $(BINDIR)
76 - cmd.exe /C if exist depends.mingw del depends.mingw
77 + rm -rf $(XSLT_INTDIR) $(XSLT_INTDIR_A)
78 + rm -rf $(EXSLT_INTDIR) $(EXSLT_INTDIR_A)
79 + rm -rf $(UTILS_INTDIR) $(UTILS_INTDIR_A)
80 + rm -rf $(BINDIR)
81 + rm -f depends.mingw
82
83 rebuild : clean all
84
85 distclean : clean
86 - cmd.exe /C if exist config.* del config.*
87 - cmd.exe /C if exist depends.* del depends.*
88 - cmd.exe /C if exist Makefile del Makefile
89 + rm -f config.*
90 + rm -f depends.*
91 + rm -f Makefile
92
93 install-libs : all
94 - cmd.exe /C if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME)
95 - cmd.exe /C if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME)
96 - cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX)
97 - cmd.exe /C if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
98 - cmd.exe /C copy $(XSLT_SRCDIR)\*.h $(INCPREFIX)\$(XSLT_BASENAME)
99 - cmd.exe /C copy $(EXSLT_SRCDIR)\*.h $(INCPREFIX)\$(EXSLT_BASENAME)
100 - cmd.exe /C copy $(BINDIR)\$(XSLT_SO) $(SOPREFIX)
101 - cmd.exe /C copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX)
102 - cmd.exe /C copy $(BINDIR)\$(XSLT_IMP) $(LIBPREFIX)
103 - cmd.exe /C copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX)
104 - cmd.exe /C copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX)
105 - cmd.exe /C copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX)
106 + if [ ! -d $(INCPREFIX)/$(XSLT_BASENAME) ]; then mkdir -p $(INCPREFIX)/$(XSLT_BASENAME); fi
107 + if [ ! -d $(INCPREFIX)/$(EXSLT_BASENAME) ]; then mkdir -p $(INCPREFIX)/$(EXSLT_BASENAME); fi
108 + if [ ! -d $(BINPREFIX) ]; then mkdir -p $(BINPREFIX); fi
109 + if [ ! -d $(LIBPREFIX) ]; then mkdir -p $(LIBPREFIX); fi
110 + cp $(XSLT_SRCDIR)/*.h $(INCPREFIX)/$(XSLT_BASENAME)
111 + cp $(EXSLT_SRCDIR)/*.h $(INCPREFIX)/$(EXSLT_BASENAME)
112 + cp $(BINDIR)/$(XSLT_SO) $(SOPREFIX)
113 + cp $(BINDIR)/$(XSLT_A) $(LIBPREFIX)
114 + cp $(BINDIR)/$(XSLT_IMP) $(LIBPREFIX)
115 + cp $(BINDIR)/$(EXSLT_SO) $(SOPREFIX)
116 + cp $(BINDIR)/$(EXSLT_A) $(LIBPREFIX)
117 + cp $(BINDIR)/$(EXSLT_IMP) $(LIBPREFIX)
118
119 install : install-libs
120 - cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX)
121 + cp $(BINDIR)/*.exe $(BINPREFIX)
122
123 install-dist : install
124
125 @@ -201,16 +201,16 @@
126
127 # Makes the compiler output directory.
128 $(BINDIR) :
129 - cmd.exe /C if not exist $(BINDIR) mkdir $(BINDIR)
130 + if [ ! -d $(BINDIR) ]; then mkdir -p $(BINDIR); fi
131
132
133 # Makes the libxslt intermediate directory.
134 $(XSLT_INTDIR) :
135 - cmd.exe /C if not exist $(XSLT_INTDIR) mkdir $(XSLT_INTDIR)
136 + if [ ! -d $(XSLT_INTDIR) ]; then mkdir -p $(XSLT_INTDIR); fi
137
138 # Makes the static libxslt intermediate directory.
139 $(XSLT_INTDIR_A) :
140 - cmd.exe /C if not exist $(XSLT_INTDIR_A) mkdir $(XSLT_INTDIR_A)
141 + if [ ! -d $(XSLT_INTDIR_A) ]; then mkdir -p $(XSLT_INTDIR_A); fi
142
143 # An implicit rule for libxslt compilation.
144 $(XSLT_INTDIR)/%.o : $(XSLT_SRCDIR)/%.c
145 @@ -230,21 +230,21 @@
146 XSLTSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(XSLT_IMP)
147 XSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
148 XSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)
149 -$(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS)
150 +$(BINDIR)/$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS)
151 $(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -llibxml2
152
153 # Creates the libxslt archive.
154 -$(BINDIR)\$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A)
155 +$(BINDIR)/$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A)
156 $(AR) $(ARFLAGS) $(BINDIR)/$(XSLT_A) $(XSLT_OBJS_A)
157
158
159 # Creates the libexslt intermediate directory.
160 $(EXSLT_INTDIR) :
161 - cmd.exe /C if not exist $(EXSLT_INTDIR) mkdir $(EXSLT_INTDIR)
162 + if [ ! -d $(EXSLT_INTDIR) ]; then mkdir -p $(EXSLT_INTDIR); fi
163
164 # Creates the static libexslt intermediate directory.
165 $(EXSLT_INTDIR_A) :
166 - cmd.exe /C if not exist $(EXSLT_INTDIR_A) mkdir $(EXSLT_INTDIR_A)
167 + if [ ! -d $(EXSLT_INTDIR_A) ]; then mkdir -p $(EXSLT_INTDIR_A); fi
168
169 # An implicit rule for libexslt compilation.
170 $(EXSLT_INTDIR)/%.o : $(EXSLT_SRCDIR)/%.c
171 @@ -265,21 +265,21 @@
172 EXSLTSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(EXSLT_IMP)
173 EXSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBEXSLT_MAJOR_VERSION)
174 EXSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBEXSLT_MINOR_VERSION)
175 -$(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt
176 +$(BINDIR)/$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt
177 $(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_BASENAME) -llibxml2
178
179 # Creates the libexslt archive.
180 -$(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta
181 - $(AR) $(ARFLAGS) $(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A)
182 +$(BINDIR)/$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta
183 + $(AR) $(ARFLAGS) $(BINDIR)/$(EXSLT_A) $(EXSLT_OBJS_A)
184
185
186 # Creates the utils intermediate directory.
187 $(UTILS_INTDIR) :
188 - cmd.exe /C if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR)
189 + if [ ! -d $(UTILS_INTDIR) ]; then mkdir -p $(UTILS_INTDIR); fi
190
191 # An implicit rule for xsltproc and friends.
192 APPLIBS = $(LIBS)
193 -APPLIBS += -llibxml2 -l$(XSLT_BASENAME) -l$(EXSLT_BASENAME)
194 +APPLIBS += -l$(EXSLT_BASENAME) -l$(XSLT_BASENAME) -llibxml2
195 APP_LDFLAGS = $(LDFLAGS)
196 APP_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
197 APP_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)
198 @@ -288,11 +288,11 @@
199 APP_LDFLAGS += -Bstatic
200 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
201 $(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $<
202 - $(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F))
203 + $(LD) $(APP_LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) $(APPLIBS)
204 else
205 $(BINDIR)/%.exe : $(UTILS_SRCDIR)/%.c
206 $(CC) $(CFLAGS) -o $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) -c $<
207 - $(LD) $(APP_LDFLAGS) -o $@ $(APPLIBS) $(subst .c,.o,$(UTILS_INTDIR)/$(<F))
208 + $(LD) $(APP_LDFLAGS) -o $@ $(subst .c,.o,$(UTILS_INTDIR)/$(<F)) $(APPLIBS)
209 endif
210
211 # Builds xsltproc and friends. Uses the implicit rule for commands.
212 diff -ruN libxslt-1.1.24/win32/configure.js libxslt-1.1.24-fixed/win32/configure.js
213 --- libxslt-1.1.24/win32/configure.js Fri Aug 3 15:41:02 2007
214 +++ libxslt-1.1.24-fixed/win32/configure.js Tue May 20 22:08:16 2008
215 @@ -205,8 +205,8 @@
216 vf.WriteLine("CRUNTIME=" + cruntime);
217 vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));
218 } else if (compiler == "mingw") {
219 - vf.WriteLine("INCLUDE+=;" + buildInclude);
220 - vf.WriteLine("LIB+=;" + buildLib);
221 + vf.WriteLine("INCLUDE+=" + buildInclude);
222 + vf.WriteLine("LIB+=" + buildLib);
223 }
224 vf.Close();
225 }
226 @@ -406,7 +406,7 @@
227 withModules=0;
228 }
229
230 -dirSep = "\\";
231 +dirSep = "/";
232 //if (compiler == "mingw")
233 // dirSep = "/";
234 if (buildBinPrefix == "")
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.