----- Original Message ----- > From: "Charles Briere" <[email protected]> > To: "mathieu desnoyers" <[email protected]> > Cc: [email protected], "Charles Briere" > <[email protected]> > Sent: Wednesday, November 27, 2013 10:48:30 AM > Subject: [PATCH liburcu 2/5] Dont link pthread on Android > > On Android, pthread is already part of libc > called Bionic and doesn't have an external > library to link with. > > Signed-off-by: Charles Briere <[email protected]> > --- > Makefile.am | 5 ++++- > tests/benchmark/Makefile.am | 4 +++- > tests/regression/Makefile.am | 4 +++- > tests/unit/Makefile.am | 4 +++- > 4 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index e09778f..baac8b9 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -4,7 +4,10 @@ INCLUDES = -I$(top_builddir)/urcu > > #Add the -version-info directly here since we are only building > # library that use the version-info > -AM_LDFLAGS=-lpthread -version-info $(URCU_LIBRARY_VERSION) > +AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION) > +if !TARGET_IS_ANDROID > +AM_LDFLAGS += -lpthread > +endif > AM_CFLAGS=-Wall > > SUBDIRS = . doc tests > diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am > index e071034..91ba1da 100644 > --- a/tests/benchmark/Makefile.am > +++ b/tests/benchmark/Makefile.am > @@ -1,4 +1,6 @@ > -AM_LDFLAGS=-lpthread > +if !TARGET_IS_ANDROID > +AM_LDFLAGS += -lpthread
change = for += is triggering those warnings ./bootstrap + [ ! -e config ] + autoreconf -i tests/benchmark/Makefile.am:2: AM_LDFLAGS must be set with `=' before using `+=' tests/regression/Makefile.am:2: AM_LDFLAGS must be set with `=' before using `+=' tests/unit/Makefile.am:2: AM_LDFLAGS must be set with `=' before using `+=' autoreconf: automake failed with exit status: 1 Will fix in the patch myself. Thanks, Mathieu > +endif > AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g > > noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \ > diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am > index 2c0542f..2cefa33 100644 > --- a/tests/regression/Makefile.am > +++ b/tests/regression/Makefile.am > @@ -1,4 +1,6 @@ > -AM_LDFLAGS=-lpthread > +if !TARGET_IS_ANDROID > +AM_LDFLAGS += -lpthread > +endif > AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g > > noinst_PROGRAMS = test_urcu_fork \ > diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am > index 1fa8b71..85860e2 100644 > --- a/tests/unit/Makefile.am > +++ b/tests/unit/Makefile.am > @@ -1,4 +1,6 @@ > -AM_LDFLAGS=-lpthread > +if !TARGET_IS_ANDROID > +AM_LDFLAGS += -lpthread > +endif > AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g > > noinst_PROGRAMS = test_uatomic \ > -- > 1.8.4.2 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
