From 60ed133d675576a3909010180c79fe6eca32d243 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Fri, 25 Jul 2014 16:23:35 +0000
Subject: Ensure we set rpath in SunOS build, fixes check-shlibs.

---
 net/omniORB/distinfo         |  4 ++--
 net/omniORB/patches/patch-ae | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'net')

diff --git a/net/omniORB/distinfo b/net/omniORB/distinfo
index a50d23388db..293f0ef3423 100644
--- a/net/omniORB/distinfo
+++ b/net/omniORB/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2014/01/19 11:28:59 wiz Exp $
+$NetBSD: distinfo,v 1.6 2014/07/25 16:23:35 jperkin Exp $
 
 SHA1 (omniORB-4.1.7.tar.bz2) = e039eba5f63458651cfdc8a67c664c1ce4134540
 RMD160 (omniORB-4.1.7.tar.bz2) = fddd28888a8f735be0d47a487f4891325f8c3c6c
@@ -7,4 +7,4 @@ SHA1 (patch-aa) = 679f8f8da61c1e5106ae40067c7d8f5dcc1576d4
 SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c
 SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed
 SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80
-SHA1 (patch-ae) = a7090d82ea71fc96deecb463e1262b83f15a8bb2
+SHA1 (patch-ae) = cdf99c4aa901c69fc4f22321d6616a7694264be8
diff --git a/net/omniORB/patches/patch-ae b/net/omniORB/patches/patch-ae
index a0235b15115..8e51d62fbff 100644
--- a/net/omniORB/patches/patch-ae
+++ b/net/omniORB/patches/patch-ae
@@ -1,8 +1,10 @@
-$NetBSD: patch-ae,v 1.3 2012/01/29 04:03:17 sbd Exp $
+$NetBSD: patch-ae,v 1.4 2014/07/25 16:23:35 jperkin Exp $
 
---- mk/beforeauto.mk.in.orig	2010-11-22 23:00:44.000000000 +0000
+Ensure we set the correct rpaths.
+
+--- mk/beforeauto.mk.in.orig	2012-12-21 16:08:59.000000000 +0000
 +++ mk/beforeauto.mk.in
-@@ -768,6 +768,10 @@ IMPORT_CPPFLAGS += -D__linux__
+@@ -778,6 +778,10 @@ IMPORT_CPPFLAGS += -D__linux__
  OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10
  OMNITHREAD_CPPFLAGS = -D_REENTRANT
  OMNITHREAD_LIB += -lpthread
@@ -13,7 +15,16 @@ $NetBSD: patch-ae,v 1.3 2012/01/29 04:03:17 sbd Exp $
  endif
  
  ###################
-@@ -1072,10 +1076,27 @@ OMNITHREAD_LIB += -pthread
+@@ -804,7 +808,7 @@ THREAD_LIB = -lthread $(CXXMTFLAG)
+ OMNITHREAD_LIB += -lpthread -lposix4 $(CXXMTFLAG)
+ 
+ ifdef Compiler_GCC
+-SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-h,$$soname
++SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-h,$$soname -Wl,-R$(INSTALLLIBDIR)
+ endif
+ ifdef Compiler_Sun5
+ SharedLibraryPlatformLinkFlagsTemplate = -G -h $$soname
+@@ -1088,10 +1092,27 @@ OMNITHREAD_LIB += -pthread
  endif
  
  ###################
-- 
cgit v1.2.3