From patchwork Fri Sep 2 20:50:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 1122982 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p82KpDeI025181 for ; Fri, 2 Sep 2011 20:51:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755815Ab1IBUvM (ORCPT ); Fri, 2 Sep 2011 16:51:12 -0400 Received: from sentry-two.sandia.gov ([132.175.109.14]:51073 "EHLO sentry-two.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755791Ab1IBUvL (ORCPT ); Fri, 2 Sep 2011 16:51:11 -0400 X-WSS-ID: 0LQWXX8-0B-3U2-02 X-M-MSG: Received: from interceptor1.sandia.gov (interceptor1.sandia.gov [132.175.109.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sentry-two.sandia.gov (Postfix) with ESMTP id 166FC1897CF for ; Fri, 2 Sep 2011 14:51:08 -0600 (MDT) Received: from sentry.sandia.gov (mm04snlnto.sandia.gov [132.175.109.21]) by interceptor1.sandia.gov (RSA Interceptor) for ; Fri, 2 Sep 2011 14:51:00 -0600 Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Fri, 02 Sep 2011 14:50:50 -0600 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from skynetrps1.sandia.gov (skynetrps1.sandia.gov [134.253.138.1]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id p82KoNbS027563; Fri, 2 Sep 2011 14:50:24 -0600 From: "Jim Schutt" To: ceph-devel@vger.kernel.org cc: "Jim Schutt" Subject: [PATCH] osd: nss build of OSD.cc needs CRYPTO_CXXFLAGS since commit d59f34ab Date: Fri, 2 Sep 2011 14:50:45 -0600 Message-ID: <1314996645-19678-1-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.7.1 X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.9.2.204214 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' SUPERLONG_LINE 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, __ANY_URI 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20110902205053; ID=1; SEV=2.3.1; DFV=B2011090220; IFV=NA; AIF=B2011090220; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230312E34453631343141432E303041413A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2011090220_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 627F9E202EW1053018-01-01 X-RSA-Inspected: yes X-RSA-Classifications: public X-RSA-Action: allow Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 02 Sep 2011 20:51:13 +0000 (UTC) nss build fails like this: if /bin/sh ../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I. -I. -D__KERNEL_STRICT_NAMES -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -rdynamic -Winit-self -Wpointer-arith -fno-strict-aliasing -Wnon-virtual-dtor -Wno-invalid-offsetof -Wstrict-null-sentinel -g -MT OSD.lo -MD -MP -MF ".deps/OSD.Tpo" -c -o OSD.lo `test -f 'osd/OSD.cc' || echo './'`osd/OSD.cc; \ then mv -f ".deps/OSD.Tpo" ".deps/OSD.Plo"; else rm -f ".deps/OSD.Tpo"; exit 1; fi g++ -DHAVE_CONFIG_H -I. -I. -I. -D__KERNEL_STRICT_NAMES -Wall -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -rdynamic -Winit-self -Wpointer-arith -fno-strict-aliasing -Wnon-virtual-dtor -Wno-invalid-offsetof -Wstrict-null-sentinel -g -MT OSD.lo -MD -MP -MF .deps/OSD.Tpo -c osd/OSD.cc -fPIC -DPIC -o .libs/OSD.o In file included from ./os/LFNIndex.h:27, from ./os/HashIndex.h:20, from ./os/FileStore.h:26, from osd/OSD.cc:25: ./common/ceph_crypto.h:44:22: error: pk11pub.h: No such file or directory Commit d59f34ab made FileStore.h include HashIndex.h, which ultimately results in OSD.cc including ceph_crypto.h. Signed-off-by: Jim Schutt --- src/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e53b68d..f3ca34b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -928,6 +928,7 @@ libosd_la_SOURCES = \ osd/OSDCaps.cc \ osd/Watch.cc \ osd/ClassHandler.cc +libosd_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS} libosd_la_LIBADD = libglobal.la noinst_LTLIBRARIES += libosd.la