summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2011-07-13 17:34:19 +0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-07-13 22:16:32 +0200
commit9eb41624ffdff466087749b64a57c5673cd2d2e7 (patch)
tree5fef09462fab79d52ce235b1fcc273e992b4c296
parent41d2a1477233231ae0445d5ac07320290b686b4e (diff)
package: add Mini-XML
[Peter: don't build mxmldoc as it needs spawn.h] Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Config.in1
-rw-r--r--package/mxml/Config.in6
-rw-r--r--package/mxml/mxml-2.6-fix-cross-target-installation.patch53
-rw-r--r--package/mxml/mxml.mk15
4 files changed, 75 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index 2fa9ff5ae..fb5a570c1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -367,6 +367,7 @@ source "package/libroxml/Config.in"
source "package/libxml-parser-perl/Config.in"
source "package/libxml2/Config.in"
source "package/libxslt/Config.in"
+source "package/mxml/Config.in"
source "package/xerces/Config.in"
source "package/yajl/Config.in"
endmenu
diff --git a/package/mxml/Config.in b/package/mxml/Config.in
new file mode 100644
index 000000000..d3202b4bc
--- /dev/null
+++ b/package/mxml/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MXML
+ bool "Mini-XML"
+ help
+ Lightweight XML Library
+
+ http://www.minixml.org
diff --git a/package/mxml/mxml-2.6-fix-cross-target-installation.patch b/package/mxml/mxml-2.6-fix-cross-target-installation.patch
new file mode 100644
index 000000000..62b6bbc8d
--- /dev/null
+++ b/package/mxml/mxml-2.6-fix-cross-target-installation.patch
@@ -0,0 +1,53 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Subject: [PATCH] mxml: workaround for cross build
+
+The added patch is a workaround for cross build as follows:
+
+ * disable run of a test binary at build time
+ * disable generation of documentation using the mxmldoc binary
+ * remove now non-existent entries from the install target
+ * disable strip when running install
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
+--- mxml-2.6-dist//Makefile.in 2008-12-06 06:20:38.000000000 +0200
++++ mxml-2.6/Makefile.in 2011-07-13 07:25:36.615999491 +0300
+@@ -59,7 +59,7 @@
+ # Install commands...
+ #
+
+-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s
++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755
+ INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_DIR = $(INSTALL) -d
+ INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755
+@@ -88,7 +88,7 @@
+ 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) libmxml.a
+
+
+ #
+@@ -134,8 +134,6 @@
+ #
+
+ install: $(TARGETS) install-$(LIBMXML) install-libmxml.a
+- $(INSTALL_DIR) $(BUILDROOT)$(bindir)
+- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
+ $(INSTALL_DIR) $(BUILDROOT)$(docdir)
+ for file in $(DOCFILES); do \
+ $(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
+@@ -144,10 +142,6 @@
+ $(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
+ $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
+ $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
+- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
+- $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
+- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
+- $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
+
+ install-libmxml.a:
+ $(INSTALL_DIR) $(BUILDROOT)$(libdir)
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
new file mode 100644
index 000000000..e45abe920
--- /dev/null
+++ b/package/mxml/mxml.mk
@@ -0,0 +1,15 @@
+#############################################################
+#
+# mxml
+#
+#############################################################
+MXML_VERSION = 2.6
+MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6
+MXML_INSTALL_STAGING = YES
+
+MXML_INSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_UNINSTALL_STAGING_OPT = DSTROOT=$(TARGET_DIR) uninstall
+MXML_UNINSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) uninstall
+
+$(eval $(call AUTOTARGETS,package,mxml))