Attachment 56805 Details for Bug 42524 – Correct patch to build on Android

[patch] Correct patch to build on Android

patch-to-build-on-Android.patch (text/plain), 6.92 KB, created by Alvaro Soliverez on 2012-02-09 03:26:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alvaro Soliverez

Created: 2012-02-09 03:26:13 UTC

Size: 6.92 KB

patch

obsolete

>From 76a7fae098f0691ee27199faf1d0f7f4226bf845 Mon Sep 17 00:00:00 2001
>From: Derek Foreman <derek.foreman@collabora.co.uk>
>Date: Fri, 13 May 2011 15:31:57 -0400
>Subject: [PATCH] Support building for Android
>
>Conflicts:
>
>	telepathy-ytstenut-glib/tests/Makefile.am
>
>Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
>---
> .gitignore                                     |    1 +
> Android.mk                                     |   38 +++++++++++++++++
> telepathy-ytstenut-glib/Makefile.am            |   12 +++++
> telepathy-ytstenut-glib/extensions/Makefile.am |   14 ++++++-
> telepathy-ytstenut-glib/tests/Makefile.am      |   53 ++++++++++++++++++++++++
> 5 files changed, 117 insertions(+), 1 deletions(-)
> create mode 100644 Android.mk
>
>diff --git a/.gitignore b/.gitignore
>index b839f5f..5c814d6 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -8,6 +8,7 @@
> *.bak
> .deps
> .libs
>+Android.mk
> Makefile
> Makefile.in
> TAGS
>diff --git a/Android.mk b/Android.mk
>new file mode 100644
>index 0000000..83fb647
>--- /dev/null
>+++ b/Android.mk
>@@ -0,0 +1,38 @@
>+LOCAL_PATH:= $(call my-dir)
>+
>+include $(CLEAR_VARS)
>+
>+TELEPATHY_YTSTENUT_BUILT_SOURCES := \
>+	telepathy-ytstenut-glib/Android.mk \
>+	telepathy-ytstenut-glib/extensions/Android.mk \
>+	telepathy-ytstenut-glib/tests/Android.mk
>+
>+telepathy-ytstenut-configure-real:
>+	cd $(TELEPATHY_YTSTENUT_TOP) ; \
>+	CXX="$(CONFIGURE_CXX)" \
>+	CC="$(CONFIGURE_CC)" \
>+	CFLAGS="$(CONFIGURE_CFLAGS)" \
>+	LD=$(TARGET_LD) \
>+	LDFLAGS="$(CONFIGURE_LDFLAGS)" \
>+	CPP=$(CONFIGURE_CPP) \
>+	CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
>+	PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
>+	PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
>+	$(TELEPATHY_YTSTENUT_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \
>+		--disable-spec-documentation --disable-qt4 \
>+		--disable-Werror && \
>+	for file in $(TELEPATHY_YTSTENUT_BUILT_SOURCES); do \
>+		rm -f $$file && \
>+		make -C $$(dirname $$file) $$(basename $$file) ; \
>+	done
>+
>+telepathy-ytstenut-configure: telepathy-ytstenut-configure-real
>+
>+.PHONY: telepathy-ytstenut-configure
>+
>+CONFIGURE_TARGETS += telepathy-ytstenut-configure
>+
>+#include all the subdirs...
>+-include $(TELEPATHY_YTSTENUT_TOP)/telepathy-ytstenut-glib/Android.mk
>+-include $(TELEPATHY_YTSTENUT_TOP)/telepathy-ytstenut-glib/extensions/Android.mk
>+-include $(TELEPATHY_YTSTENUT_TOP)/telepathy-ytstenut-glib/tests/Android.mk
>diff --git a/telepathy-ytstenut-glib/Makefile.am b/telepathy-ytstenut-glib/Makefile.am
>index 28a7243..4b1fc17 100644
>--- a/telepathy-ytstenut-glib/Makefile.am
>+++ b/telepathy-ytstenut-glib/Makefile.am
>@@ -169,3 +169,15 @@ _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
> 	$(tools_dir)/glib-client-marshaller-gen.py Makefile.am
> 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp_yts > $@
> 
>+Android.mk: Makefile.am $(BUILT_SOURCES)
>+	androgenizer -:PROJECT telepathy-ytstenut \
>+	 -:SHARED telepathy-ytstenut-glib \
>+	 -:TAGS eng debug \
>+	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
>+	 -:SOURCES $(libtelepathy_ytstenut_glib_la_SOURCES) \
>+	           $(nodist_libtelepathy_ytstenut_glib_la_SOURCES) \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(libtelepathy_ytstenut_glib_la_LIBADD) \
>+	> $@
>diff --git a/telepathy-ytstenut-glib/extensions/Makefile.am b/telepathy-ytstenut-glib/extensions/Makefile.am
>index 159a93a..e6db5c4 100644
>--- a/telepathy-ytstenut-glib/extensions/Makefile.am
>+++ b/telepathy-ytstenut-glib/extensions/Makefile.am
>@@ -67,4 +67,16 @@ _gen/cli-connection-future-body.h _gen/cli-connection-future.h: _gen/all.xml \
> 		--subclass-assert=TP_IS_CONNECTION \
> 		--iface-quark-prefix=_TP_YTS_IFACE_QUARK \
> 		--tp-proxy-api=0.7.6 \
>-		$< _Tp_Yts_Cli _gen/cli-connection-future
>\ No newline at end of file
>+		$< _Tp_Yts_Cli _gen/cli-connection-future
>+
>+Android.mk: Makefile.am $(BUILT_SOURCES)
>+	androgenizer -:PROJECT telepathy-ytstenut \
>+	 -:SHARED future-extensions -:TAGS eng debug \
>+	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
>+	 -:SOURCES $(libfuture_extensions_la_SOURCES) \
>+	  $(nodist_libfuture_extensions_la_SOURCES) \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(libfuture_extensions_la_LIBADD) \
>+	> $@
>diff --git a/telepathy-ytstenut-glib/tests/Makefile.am b/telepathy-ytstenut-glib/tests/Makefile.am
>index 71b7260..e0d50db 100644
>--- a/telepathy-ytstenut-glib/tests/Makefile.am
>+++ b/telepathy-ytstenut-glib/tests/Makefile.am
>@@ -26,3 +26,56 @@ noinst_PROGRAMS = \
> 	server-nosey-status \
> 	server-passing-service \
> 	server-passing-status
>+
>+Android.mk: Makefile.am
>+	androgenizer -:PROJECT telepathy-ytstenut-glib \
>+	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
>+	 -:EXECUTABLE nosey-status -:TAGS eng debug \
>+	 -:SOURCES nosey-status.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE passing-service -:TAGS eng debug \
>+	 -:SOURCES passing-service.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE passing-status -:TAGS eng debug \
>+	 -:SOURCES passing-status.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE server-nosey-status -:TAGS eng debug \
>+	 -:SOURCES server-nosey-status.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE server-passing-service -:TAGS eng debug \
>+	 -:SOURCES server-passing-service.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE server-passing-status -:TAGS eng debug \
>+	 -:SOURCES server-passing-status.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE server-client-ping -:TAGS eng debug \
>+	 -:SOURCES server-client-ping.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	 -:EXECUTABLE server-client-pong -:TAGS eng debug \
>+	 -:SOURCES server-client-pong.c \
>+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>+	  $(AM_CFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(LDADD) libfuture-extensions.la \
>+	> $@
>-- 
>1.7.7
>

Actions: View | Splinter Review

Attachments on bug 42524: 53064 | 56800 | 56805 | 56817 | 56830

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.