diff mbox

fix build of unittest_formatter

Message ID 1354115148-5549-1-git-send-email-danny.al-gaaf@bisect.de (mailing list archive)
State New, archived
Headers show

Commit Message

Danny Al-Gaaf Nov. 28, 2012, 3:05 p.m. UTC 
Add CRYPTO_CXXFLAGS to unittest_formatter_CXXFLAGS to find pk11pub.h to
be included in src/common/ceph_crypto.h.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Danny Al-Gaaf Dec. 11, 2012, 12:08 p.m. UTC | #1 
Hi,

did you have a chance to take a look at this patch?

Danny

Am 28.11.2012 16:05, schrieb Danny Al-Gaaf:
> Add CRYPTO_CXXFLAGS to unittest_formatter_CXXFLAGS to find pk11pub.h to
> be included in src/common/ceph_crypto.h.
> 
> Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
> ---
>  src/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index be851d6..2f6f486 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -764,7 +764,7 @@ check_PROGRAMS += unittest_heartbeatmap
>  unittest_formatter_SOURCES = test/formatter.cc rgw/rgw_formats.cc
>  unittest_formatter_LDFLAGS = $(PTHREAD_CFLAGS) ${AM_LDFLAGS}
>  unittest_formatter_LDADD = ${UNITTEST_LDADD} $(LIBGLOBAL_LDA)
> -unittest_formatter_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
> +unittest_formatter_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
>  check_PROGRAMS += unittest_formatter
>  
>  unittest_libcephfs_config_SOURCES = test/libcephfs_config.cc
> 

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sage Weil Dec. 11, 2012, 4:44 p.m. UTC | #2 
I missed it before; applied.

Thanks!
sage


On Tue, 11 Dec 2012, Danny Al-Gaaf wrote:

> Hi,
> 
> did you have a chance to take a look at this patch?
> 
> Danny
> 
> Am 28.11.2012 16:05, schrieb Danny Al-Gaaf:
> > Add CRYPTO_CXXFLAGS to unittest_formatter_CXXFLAGS to find pk11pub.h to
> > be included in src/common/ceph_crypto.h.
> > 
> > Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
> > ---
> >  src/Makefile.am | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/Makefile.am b/src/Makefile.am
> > index be851d6..2f6f486 100644
> > --- a/src/Makefile.am
> > +++ b/src/Makefile.am
> > @@ -764,7 +764,7 @@ check_PROGRAMS += unittest_heartbeatmap
> >  unittest_formatter_SOURCES = test/formatter.cc rgw/rgw_formats.cc
> >  unittest_formatter_LDFLAGS = $(PTHREAD_CFLAGS) ${AM_LDFLAGS}
> >  unittest_formatter_LDADD = ${UNITTEST_LDADD} $(LIBGLOBAL_LDA)
> > -unittest_formatter_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
> > +unittest_formatter_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
> >  check_PROGRAMS += unittest_formatter
> >  
> >  unittest_libcephfs_config_SOURCES = test/libcephfs_config.cc
> > 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/Makefile.am b/src/Makefile.am
index be851d6..2f6f486 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -764,7 +764,7 @@  check_PROGRAMS += unittest_heartbeatmap
 unittest_formatter_SOURCES = test/formatter.cc rgw/rgw_formats.cc
 unittest_formatter_LDFLAGS = $(PTHREAD_CFLAGS) ${AM_LDFLAGS}
 unittest_formatter_LDADD = ${UNITTEST_LDADD} $(LIBGLOBAL_LDA)
-unittest_formatter_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
+unittest_formatter_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_formatter
 
 unittest_libcephfs_config_SOURCES = test/libcephfs_config.cc