From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: Akira Yokosawa <akiyks@gmail.com>
Cc: perfbook@vger.kernel.org
Subject: Re: [PATCH] CodeSamples/Makefile: Add conditional for liburcu on Ubuntu Bionic
Date: Wed, 3 Oct 2018 20:32:12 -0700 [thread overview]
Message-ID: <20181004033212.GX4222@linux.ibm.com> (raw)
In-Reply-To: <2bdaa0c0-3a0a-83a7-ee1b-2747bae2cb03@gmail.com>
On Wed, Oct 03, 2018 at 11:52:54PM +0900, Akira Yokosawa wrote:
> >From 91e27d8066e353966b4c35de15f70e278fbcb8ce Mon Sep 17 00:00:00 2001
> From: Akira Yokosawa <akiyks@gmail.com>
> Date: Wed, 3 Oct 2018 23:29:29 +0900
> Subject: [PATCH] CodeSamples/Makefile: Add conditional for liburcu on Ubuntu Bionic
>
> On Ubuntu Bionic, header files of liburcu-dev are installed under
> an arch dependent directory such as /usr/include/x86_64-linux-gnu/.
>
> Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
Applied and pushed, thank you!
Thanx, Paul
> ---
> CodeSamples/Makefile | 4 +++-
> CodeSamples/depends.mk | 7 +++++++
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/CodeSamples/Makefile b/CodeSamples/Makefile
> index 036fc66..3a96f5c 100644
> --- a/CodeSamples/Makefile
> +++ b/CodeSamples/Makefile
> @@ -39,7 +39,9 @@ endif
> echo "" >> api.h
> cat api-pthreads/api-gcc.h >> api.h
> echo "" >> api.h
> - if test -f /usr/include/urcu-call-rcu.h -o -f /usr/local/include/urcu-call-rcu.h ; \
> + if test -f /usr/include/urcu-call-rcu.h -o \
> + -f /usr/local/include/urcu-call-rcu.h -o \
> + -f /usr/include/$(subdir_ub)/urcu-call-rcu.h ; \
> then \
> echo "#define _LGPL_SOURCE" >> api.h; \
> echo "#include <urcu/rculist.h>" >> api.h; \
> diff --git a/CodeSamples/depends.mk b/CodeSamples/depends.mk
> index 77a76bf..31a8daf 100644
> --- a/CodeSamples/depends.mk
> +++ b/CodeSamples/depends.mk
> @@ -4,18 +4,25 @@ endif
>
> ifeq ($(arch),i686)
> target := x86
> +subdir_ub := i386-linux-gnu
> else ifeq ($(arch),x86_64)
> target := x86
> +subdir_ub := x86_64-linux-gnu
> else ifeq ($(arch),ppc64)
> target := ppc64
> +subdir_ub :=
> else ifeq ($(arch),ppc64le)
> target := ppc64
> +subdir_ub := powerpc64le-linux-gnu
> else ifeq ($(arch),aarch64)
> target := arm64
> +subdir_ub := aarch64-linux-gnu
> else ifneq (,$(findstring arm,$(arch)))
> target := arm
> +subdir_ub := arm-linux-gnueabihf
> else
> target :=
> +subdir_ub :=
> endif
>
> api_depend_common := $(top)/linux/common.h \
> --
> 2.7.4
>
prev parent reply other threads:[~2018-10-04 10:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-03 14:52 [PATCH] CodeSamples/Makefile: Add conditional for liburcu on Ubuntu Bionic Akira Yokosawa
2018-10-04 3:32 ` Paul E. McKenney [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181004033212.GX4222@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=akiyks@gmail.com \
--cc=perfbook@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox