From patchwork Mon Jan 6 17:37:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 307393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 0E9E42C00D8 for ; Tue, 7 Jan 2014 04:37:17 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1365B81489; Mon, 6 Jan 2014 17:37:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qsMAmbDy+7tA; Mon, 6 Jan 2014 17:37:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E0D181018; Mon, 6 Jan 2014 17:37:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D82191BF84D for ; Mon, 6 Jan 2014 17:37:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D35C080596 for ; Mon, 6 Jan 2014 17:37:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oIq1UV91kGhU for ; Mon, 6 Jan 2014 17:37:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs02.rockwellcollins.com (secvs02.rockwellcollins.com [205.175.225.241]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7373E86364 for ; Mon, 6 Jan 2014 17:37:11 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO collinscrsmtp01.rockwellcollins.com) ([131.198.63.132]) by mail-virt.rockwellcollins.com with ESMTP; 06 Jan 2014 11:37:09 -0600 Received: from ares ([131.198.63.11]) by collinscrsmtp01.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2014010611370903-1629529 ; Mon, 6 Jan 2014 11:37:09 -0600 From: Matt Weber To: buildroot@busybox.net Date: Mon, 6 Jan 2014 11:37:06 -0600 Message-Id: <1389029826-10415-1-git-send-email-mlweber1@rockwellcollins.com> X-Mailer: git-send-email 1.7.1 X-MIMETrack: Itemize by SMTP Server on CollinsCRSMTP01/CedarRapids/Collins/Rockwell(Release 8.5.2FP2 HF162|May 16, 2011) at 01/06/2014 11:37:09 AM, Serialize by Router on CollinsCRSMTP01/CedarRapids/Collins/Rockwell(Release 8.5.2FP2 HF162|May 16, 2011) at 01/06/2014 11:37:09 AM, Serialize complete at 01/06/2014 11:37:09 AM X-TNEFEvaluated: 1 Subject: [Buildroot] [PATCH v3] omniorb: add COS Naming Service X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Matt Weber Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- Changes v2 -> v3: - Updated patch to be more generic and enable apps/services disabled by selecting the reduced embedded build option - Added comments in .mk to clarify what the reduced embedded build configuration consisted of Changes v1 -> v2: - Moved comment to top package/omniorb/Config.in (suggested by Thomas S) - Removed indents of variable assigments and changed hook to be a post patch hook package/omniorb/Config.in (suggested by Arnout V) - Cleaned up tab/spaces package/omniorb/Config.in (suggested by Thomas P) --- package/omniorb/Config.in | 15 +++++++++++++-- package/omniorb/omniorb.mk | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in index 192ad54..b8c4e0a 100644 --- a/package/omniorb/Config.in +++ b/package/omniorb/Config.in @@ -1,3 +1,7 @@ + +comment "omniORB needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_OMNIORB bool "omniorb" depends on BR2_INSTALL_LIBSTDCPP @@ -11,5 +15,12 @@ config BR2_PACKAGE_OMNIORB http://omniorb.sourceforge.net/ -comment "omniORB needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +if BR2_PACKAGE_OMNIORB + +config BR2_PACKAGE_OMNIORB_WITH_APPS + bool "Enable Apps and Services" + help + omniORB applications and services disabled by default + embedded system build configuration. + +endif diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index 490ff93..5671ede 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -24,6 +24,19 @@ OMNIORB_INSTALL_TARGET = YES OMNIORB_CONF_OPT += --disable-longdouble HOST_OMNIORB_CONF_OPT += --disable-longdouble +# The EmbeddedSystem define (set below in OMNIORB_ADJUST_TOOLDIR) +# enables building of just the lib and disables building of +# tools/apps/services. In some cases the apps/services are still +# required. The tools however are host related and should never +# be required on target. +define OMNIORB_ENABLE_EXTRA_APPS +$(SED) 's:SUBDIRS += lib:SUBDIRS += lib appl services:g' $(@D)/src/dir.mk +endef + +ifeq ($(BR2_PACKAGE_OMNIORB_WITH_APPS),y) +OMNIORB_POST_PATCH_HOOKS += OMNIORB_ENABLE_EXTRA_APPS +endif + # omniORB is not completely cross-compile friendly and has some # assumptions where a couple host tools must be built and then # used by the target build. The host tools generate code from @@ -32,7 +45,7 @@ HOST_OMNIORB_CONF_OPT += --disable-longdouble define OMNIORB_ADJUST_TOOLDIR # Point to the host folder to get HOST_OMNIORB tools $(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/usr/bin:g' $(@D)/mk/beforeauto.mk - # Disables OMNIORB tool building + # Disables OMNIORB app/service/tool building echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk endef OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR