NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

omniorb: add option to build applications and services

Browse Source 
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>
This commit is contained in:
Matt Weber 2014-01-06 11:37:06 -06:00 committed by Peter Korsgaard
parent 5a3554a152
commit b4a28e6c5c
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/omniorb/Config.in
View File

@ -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 config BR2_PACKAGE_OMNIORB
bool "omniorb" bool "omniorb"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
@ -11,5 +15,12 @@ config BR2_PACKAGE_OMNIORB
http://omniorb.sourceforge.net/ http://omniorb.sourceforge.net/
comment "omniORB needs a toolchain w/ C++, threads" if BR2_PACKAGE_OMNIORB
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_OMNIORB_WITH_APPS
bool "Enable Apps and Services"
help
omniORB applications and services disabled by default
embedded system build configuration.
endif

15
package/omniorb/omniorb.mk
View File

@ -24,6 +24,19 @@ OMNIORB_INSTALL_TARGET = YES
OMNIORB_CONF_OPT += --disable-longdouble OMNIORB_CONF_OPT += --disable-longdouble
HOST_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 # omniORB is not completely cross-compile friendly and has some
# assumptions where a couple host tools must be built and then # assumptions where a couple host tools must be built and then
# used by the target build. The host tools generate code from # 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 define OMNIORB_ADJUST_TOOLDIR
# Point to the host folder to get HOST_OMNIORB tools # 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 $(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 echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk
endef endef
OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR