[Buildroot] [PATCH 1/2] package/omniorb: add optional support for zlib

[Buildroot] [PATCH 1/2] package/omniorb: add optional support for zlib

[Bernd Kuhls]

When zlib was compiled before, omniorb will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libomniZIOP4.so.2.0 | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libomniORB4.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libomnithread.so.4]
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libz.so.1]
[...]

The build system offers no option to en-/disable libuuid support,
check acinclude.m4, line 435+.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/omniorb/omniorb.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index aaf3bf3..1bbde3b 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -30,6 +30,10 @@ HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
 OMNIORB_CONF_OPTS += --disable-longdouble
 HOST_OMNIORB_CONF_OPTS += --disable-longdouble
 
+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
-- 
2.7.0

[Buildroot] [PATCH 2/2] package/omniorb: add optional support for openssl

[Bernd Kuhls]

When openssl was compiled before, omniorb will use it as optional
dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libomnisslTP4.so.2.0 | grep NEEDED
 0x0000000000000001 (NEEDED)             Shared library: [libomniORB4.so.2]
 0x0000000000000001 (NEEDED)             Shared library: [libomnithread.so.4]
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libssl.so.1.0.0]
 0x0000000000000001 (NEEDED)             Shared library: [libcrypto.so.1.0.0]
[...]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/omniorb/omniorb.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index 1bbde3b..d278adc 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -30,6 +30,13 @@ HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
 OMNIORB_CONF_OPTS += --disable-longdouble
 HOST_OMNIORB_CONF_OPTS += --disable-longdouble
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+OMNIORB_CONF_OPTS += --with-openssl
+OMNIORB_DEPENDENCIES += openssl
+else
+OMNIORB_CONF_OPTS += --without-openssl
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 OMNIORB_DEPENDENCIES += zlib
 endif
-- 
2.7.0

[Buildroot] [PATCH 1/2] package/omniorb: add optional support for zlib

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 21 Feb 2016 16:18:51 +0100, Bernd Kuhls wrote:
> When zlib was compiled before, omniorb will use it as optional
> dependency:
> 
> $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libomniZIOP4.so.2.0 | grep NEEDED
>  0x0000000000000001 (NEEDED)             Shared library: [libomniORB4.so.2]
>  0x0000000000000001 (NEEDED)             Shared library: [libomnithread.so.4]
>  0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.1]
>  0x0000000000000001 (NEEDED)             Shared library: [libz.so.1]
> [...]
> 
> The build system offers no option to en-/disable libuuid support,

I guess you meant zlib, not libuuid.

> check acinclude.m4, line 435+.

Applied to master with the commit log fixed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] package/omniorb: add optional support for openssl

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 21 Feb 2016 16:18:52 +0100, Bernd Kuhls wrote:
> When openssl was compiled before, omniorb will use it as optional
> dependency:
> 
> $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libomnisslTP4.so.2.0 | grep NEEDED
>  0x0000000000000001 (NEEDED)             Shared library: [libomniORB4.so.2]
>  0x0000000000000001 (NEEDED)             Shared library: [libomnithread.so.4]
>  0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.1]
>  0x0000000000000001 (NEEDED)             Shared library: [libssl.so.1.0.0]
>  0x0000000000000001 (NEEDED)             Shared library: [libcrypto.so.1.0.0]
> [...]
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/omniorb/omniorb.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com