[Buildroot] [PATCH v2] omniorb: add COS Naming Service

Matt Weber mlweber1 at rockwellcollins.com
Tue Nov 12 22:51:47 UTC 2013


Signed-off-by: Matt Weber <mlweber1 at rockwellcollins.com>
---
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 |    8 ++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in
index 6326688..95f90dc 100644
--- a/package/omniorb/Config.in
+++ b/package/omniorb/Config.in
@@ -1,3 +1,7 @@
+
+comment "omniORB needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_OMNIORB
 	bool "omniorb"
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -10,5 +14,12 @@ config BR2_PACKAGE_OMNIORB
 
 	  http://omniorb.sourceforge.net/
 
-comment "omniORB needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+if BR2_PACKAGE_OMNIORB
+
+config BR2_PACKAGE_OMNIORB_WITH_SERVICES
+	bool "COS Naming Service"
+	default y
+	help
+	  omniORB COS Naming Service
+
+endif
diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index 490ff93..b0d3183 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -24,6 +24,14 @@ OMNIORB_INSTALL_TARGET = YES
 OMNIORB_CONF_OPT += --disable-longdouble
 HOST_OMNIORB_CONF_OPT += --disable-longdouble
 
+define OMNIORB_ENABLE_SERVICES
+$(SED) 's:SUBDIRS += lib:SUBDIRS += lib services:g' $(@D)/src/dir.mk
+endef
+
+ifeq ($(BR2_PACKAGE_OMNIORB_WITH_SERVICES),y)
+OMNIORB_POST_PATCH_HOOKS += OMNIORB_ENABLE_SERVICES
+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
-- 
1.7.1



More information about the buildroot mailing list