diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-07-27 10:45:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-07-27 10:45:02 +0200 |
commit | 42dd254f5937274f164a5a7c5fb3c1f80e38e7af (patch) | |
tree | 9d2f1aa0333e04af8493d6a5f533b6e243bf5d2b /package/mxml/patches | |
parent | 7f0a66667a815bb8e28b4c8b93666b92a667b485 (diff) |
full build on Darwin fixes
Diffstat (limited to 'package/mxml/patches')
-rw-r--r-- | package/mxml/patches/patch-Makefile_in.orig | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/package/mxml/patches/patch-Makefile_in.orig b/package/mxml/patches/patch-Makefile_in.orig deleted file mode 100644 index efe63f91a..000000000 --- a/package/mxml/patches/patch-Makefile_in.orig +++ /dev/null @@ -1,91 +0,0 @@ ---- mxml-2.6.orig/Makefile.in 2008-12-06 05:20:38.000000000 +0100 -+++ mxml-2.6/Makefile.in 2011-05-10 13:05:50.000000000 +0200 -@@ -88,7 +88,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o m - mxml-node.o mxml-search.o mxml-set.o - LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o - OBJS = mxmldoc.o testmxml.o $(LIBOBJS) --TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man -+TARGETS = $(LIBMXML) - - - # -@@ -133,13 +133,13 @@ clang: - # Install everything... - # - --install: $(TARGETS) install-$(LIBMXML) install-libmxml.a -+install: $(TARGETS) install-$(LIBMXML) - $(INSTALL_DIR) $(BUILDROOT)$(bindir) -- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) -- $(INSTALL_DIR) $(BUILDROOT)$(docdir) -- for file in $(DOCFILES); do \ -- $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \ -- done -+ #$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) -+ #$(INSTALL_DIR) $(BUILDROOT)$(docdir) -+ #for file in $(DOCFILES); do \ -+ # $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \ -+ #done - $(INSTALL_DIR) $(BUILDROOT)$(includedir) - $(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir) - $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig -@@ -294,7 +294,7 @@ mxmldoc: $(LIBMXML) mxmldoc.o - $(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS) - - mxmldoc-static: libmxml.a mxmldoc.o -- $(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS) -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mxmldoc.o libmxml.a $(LIBS) - - mxmldoc.o: mxml.h - -@@ -304,28 +304,7 @@ mxmldoc.o: mxml.h - # - - testmxml: libmxml.a testmxml.o -- $(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS) -- @echo Testing library... -- ./testmxml test.xml >temp1.xml 2>temp1s.xml -- ./testmxml temp1.xml >temp2.xml 2>temp2s.xml -- @if cmp temp1.xml temp2.xml; then \ -- echo Stdio file test passed!; \ -- $(RM) temp2.xml temp2s.xml; \ -- else \ -- echo Stdio file test failed!; \ -- fi -- @if cmp temp1.xml temp1s.xml; then \ -- echo String test passed!; \ -- $(RM) temp1.xml temp1s.xml; \ -- else \ -- echo String test failed!; \ -- fi -- @if cmp test.xml test.xmlfd; then \ -- echo File descriptor test passed!; \ -- $(RM) test.xmlfd; \ -- else \ -- echo File descriptor test failed!; \ -- fi -+ $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ testmxml.o libmxml.a $(LIBS) - - testmxml.o: mxml.h - -@@ -336,19 +315,7 @@ testmxml.o: mxml.h - - mxml.xml: mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c) - $(RM) mxml.xml -- ./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html -- if test "x`uname`" = xDarwin; then \ -- ./mxmldoc-static --docset org.minixml.docset \ -- --docversion @VERSION@ --feedname minixml.org \ -- --feedurl http://www.minixml.org/org.minixml.atom \ -- --header doc/docset.header --intro doc/docset.intro \ -- --css doc/docset.css --title "Mini-XML API Reference" \ -- mxml.xml || exit 1; \ -- /Developer/usr/bin/docsetutil package --output org.minixml.xar \ -- --atom org.minixml.atom \ -- --download-url http://www.minixml.org/org.minixml.xar \ -- org.minixml.docset || exit 1; \ -- fi -+ #./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html - - valgrind: mxmldoc-static - $(RM) valgrind.xml |