aa0aeb4bfa
Add host-pkgconf dependency to fix the following build failure with
openssl raised since commit 9d519412d6:
/nvmedata/autobuild/instance-25/output-1/per-package/omniorb/host/bin/m68k-buildroot-linux-uclibc-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -Wall -Wno-unused -fexceptions -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I.. -I./.. -I../../../../../include/omniORB4/internal -I../../../../../include/omniORB4/internal -D_OMNIORB_SSL_LIBRARY -D__OMNIORB4__ -I../../../../../stub -D_REENTRANT -I/usr/include -I. -I. -I../../../../../include -I../../../../../include -D__OSVERSION__=2 -D__linux__ -D__m68k__ -o static/sslActive.o sslActive.cc
m68k-buildroot-linux-uclibc-g++: WARNING: unsafe header/library path used in cross-compilation: '-I/usr/include'
In file included from /usr/include/stdlib.h:55,
from /usr/include/openssl/crypto.h:14,
from /usr/include/openssl/bio.h:20,
from /usr/include/openssl/ssl.h:18,
from ../../../../../include/omniORB4/sslContext.h:48,
from sslActive.cc:32:
/usr/include/bits/floatn.h:75:70: error: unknown machine mode '__TC__'
75 | typedef _Complex float __cfloat128 __attribute__ ((__mode__ (__TC__)));
|
Fixes:
- http://autobuild.buildroot.org/results/47b1906eb7dd122a81191d14ad663c5931cbfade
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
72 lines
2.6 KiB
Makefile
72 lines
2.6 KiB
Makefile
################################################################################
|
|
#
|
|
# omniorb
|
|
#
|
|
################################################################################
|
|
|
|
OMNIORB_VERSION = 4.3.0
|
|
OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION)
|
|
OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2
|
|
OMNIORB_INSTALL_STAGING = YES
|
|
OMNIORB_LICENSE = GPL2+, LGPL-2.1+
|
|
OMNIORB_LICENSE_FILES = COPYING COPYING.LIB
|
|
OMNIORB_DEPENDENCIES = host-omniorb
|
|
HOST_OMNIORB_DEPENDENCIES = host-python3
|
|
|
|
# Defaulting long double support to a safe option for the
|
|
# mix of embedded targets, this could later be automated
|
|
# based on checking the capability of the cross toolchain
|
|
# for "__LONG_DOUBLE_128__". Currently the host and target
|
|
# need to match because of the code generation done by the
|
|
# host tools during the target compile (ie headers generated
|
|
# on host are used in target build).
|
|
OMNIORB_CONF_OPTS += --disable-longdouble
|
|
HOST_OMNIORB_CONF_OPTS += --disable-longdouble
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
OMNIORB_CONF_OPTS += --with-openssl
|
|
OMNIORB_DEPENDENCIES += host-pkgconf openssl
|
|
else
|
|
OMNIORB_CONF_OPTS += --without-openssl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
OMNIORB_DEPENDENCIES += zlib
|
|
endif
|
|
|
|
# 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
|
|
|
|
ifeq ($(BR2_STATIC_LIBS),y)
|
|
define OMNIORB_DISABLE_SHARED
|
|
echo "BuildSharedLibrary =" >> $(@D)/mk/beforeauto.mk
|
|
endef
|
|
OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_DISABLE_SHARED
|
|
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
|
|
# the IDL description language, which is then built into the
|
|
# cross compiled target OMNIORB application.
|
|
define OMNIORB_ADJUST_TOOLDIR
|
|
# Point to the host folder to get HOST_OMNIORB tools
|
|
$(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/bin:g' $(@D)/mk/beforeauto.mk
|
|
# Disables OMNIORB app/service/tool building
|
|
echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk
|
|
endef
|
|
OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR
|
|
|
|
$(eval $(autotools-package))
|
|
$(eval $(host-autotools-package))
|