mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-12 06:40:08 +02:00
99 lines
3.0 KiB
Plaintext
99 lines
3.0 KiB
Plaintext
From e2a3c296c54c0bb22d2b60a87ed4e8f076a4a550 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Mon, 24 Sep 2018 08:31:32 +0200
|
|
Subject: enable shared library
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 47a0d41..c852d90 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -219,6 +219,14 @@ if test x$enable_shared != xno; then
|
|
LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
|
|
;;
|
|
|
|
+ haiku*)
|
|
+ AC_MSG_RESULT(yes)
|
|
+ LIBMXML="libmxml.so.1.6"
|
|
+ DSO="\$(CC)"
|
|
+ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
|
|
+ ;;
|
|
+
|
|
darwin)
|
|
AC_MSG_RESULT(yes)
|
|
LIBMXML="libmxml.1.dylib"
|
|
--
|
|
2.19.0
|
|
|
|
|
|
From 4b0ecbc14207e24623889a371b5404654f02cc27 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Mon, 24 Sep 2018 08:27:13 +0200
|
|
Subject: testmxml mxml.xml @MXML_EPUB@ break the build
|
|
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index eef14fe..03a203d 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -83,7 +83,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o mxml-file.o mxml-get.o \
|
|
mxml-index.o mxml-node.o mxml-search.o mxml-set.o
|
|
LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o
|
|
OBJS = mmd.o mxmldoc.o testmxml.o zipc.o $(LIBOBJS)
|
|
-ALLTARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml @MXML_EPUB@
|
|
+ALLTARGETS = $(LIBMXML) mxmldoc
|
|
CROSSTARGETS = $(LIBMXML) mxmldoc
|
|
TARGETS = $(@TARGETS@)
|
|
|
|
--
|
|
2.19.0
|
|
|
|
|
|
From f3651900fc703003e95d6dbb9d599bf13e3faaa1 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Mon, 24 Sep 2018 09:14:23 +0200
|
|
Subject: import upstream patch
|
|
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 03a203d..e720727 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -162,13 +162,13 @@ install: $(TARGETS) install-$(LIBMXML) install-libmxml.a
|
|
$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
|
|
$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
|
|
|
|
-install-libmxml.a:
|
|
+install-libmxml.a: libmxml.a
|
|
echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
|
|
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
|
$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
|
|
$(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a
|
|
|
|
-install-libmxml.so.1.6:
|
|
+install-libmxml.so.1.6: libmxml.so.1.6
|
|
echo Installing libmxml.so to $(BUILDROOT)$(libdir)...
|
|
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
|
$(INSTALL_LIB) libmxml.so.1.6 $(BUILDROOT)$(libdir)
|
|
@@ -177,14 +177,14 @@ install-libmxml.so.1.6:
|
|
$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
|
|
$(LN) libmxml.so.1.6 $(BUILDROOT)$(libdir)/libmxml.so.1
|
|
|
|
-install-libmxml.sl.1:
|
|
+install-libmxml.sl.1: libmxml.sl.1
|
|
echo Installing libmxml.sl to $(BUILDROOT)$(libdir)...
|
|
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
|
$(INSTALL_LIB) libmxml.sl.1 $(BUILDROOT)$(libdir)
|
|
$(RM) $(BUILDROOT)$(libdir)/libmxml.so
|
|
$(LN) libmxml.sl.1 $(BUILDROOT)$(libdir)/libmxml.sl
|
|
|
|
-install-libmxml.1.dylib:
|
|
+install-libmxml.1.dylib: libmxml.1.dylib
|
|
echo Installing libmxml.dylib to $(BUILDROOT)$(libdir)...
|
|
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
|
$(INSTALL_LIB) libmxml.1.dylib $(BUILDROOT)$(libdir)
|
|
--
|
|
2.19.0
|
|
|