aboutsummaryrefslogtreecommitdiff
path: root/package/omniorb
diff options
context:
space:
mode:
authorGravatar Matt Weber <mlweber1@rockwellcollins.com>2014-01-06 11:37:06 -0600
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-01-10 15:02:45 +0100
commitb4a28e6c5cb4c74649990f5256cf0f7971c1abec (patch)
treeeebbff7a69d8898b36db7984c0556ee5a3108473 /package/omniorb
parent5a3554a1527b3485689ce7d77339a667867ddca8 (diff)
downloadbuildroot-b4a28e6c5cb4c74649990f5256cf0f7971c1abec.tar.gz
buildroot-b4a28e6c5cb4c74649990f5256cf0f7971c1abec.tar.bz2
omniorb: add option to build applications and services
Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/omniorb')
-rw-r--r--package/omniorb/Config.in15
-rw-r--r--package/omniorb/omniorb.mk15
2 files changed, 27 insertions, 3 deletions
diff --git a/package/omniorb/Config.in b/package/omniorb/Config.in
index 192ad54fc2..b8c4e0a59e 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 490ff93c6d..fa2492f2b9 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