9eb41624ff
[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>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
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)
|