Fri Jul 25 16:23:35 2014 UTC ()
Ensure we set rpath in SunOS build, fixes check-shlibs.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/net/omniORB/distinfo
diff -r1.3 -r1.4 pkgsrc/net/omniORB/patches/patch-ae
cvs diff -r1.5 -r1.6 pkgsrc/net/omniORB/distinfo (expand / switch to unified diff)

--- pkgsrc/net/omniORB/distinfo 2014/01/19 11:28:59 1.5
+++ pkgsrc/net/omniORB/distinfo 2014/07/25 16:23:35 1.6
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.5 2014/01/19 11:28:59 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2014/07/25 16:23:35 jperkin Exp $
2 2
3SHA1 (omniORB-4.1.7.tar.bz2) = e039eba5f63458651cfdc8a67c664c1ce4134540 3SHA1 (omniORB-4.1.7.tar.bz2) = e039eba5f63458651cfdc8a67c664c1ce4134540
4RMD160 (omniORB-4.1.7.tar.bz2) = fddd28888a8f735be0d47a487f4891325f8c3c6c 4RMD160 (omniORB-4.1.7.tar.bz2) = fddd28888a8f735be0d47a487f4891325f8c3c6c
5Size (omniORB-4.1.7.tar.bz2) = 2625287 bytes 5Size (omniORB-4.1.7.tar.bz2) = 2625287 bytes
6SHA1 (patch-aa) = 679f8f8da61c1e5106ae40067c7d8f5dcc1576d4 6SHA1 (patch-aa) = 679f8f8da61c1e5106ae40067c7d8f5dcc1576d4
7SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c 7SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c
8SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed 8SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed
9SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80 9SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80
10SHA1 (patch-ae) = a7090d82ea71fc96deecb463e1262b83f15a8bb2 10SHA1 (patch-ae) = cdf99c4aa901c69fc4f22321d6616a7694264be8
cvs diff -r1.3 -r1.4 pkgsrc/net/omniORB/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/net/omniORB/patches/patch-ae 2012/01/29 04:03:17 1.3
+++ pkgsrc/net/omniORB/patches/patch-ae 2014/07/25 16:23:35 1.4
@@ -1,29 +1,40 @@ @@ -1,29 +1,40 @@
1$NetBSD: patch-ae,v 1.3 2012/01/29 04:03:17 sbd Exp $ 1$NetBSD: patch-ae,v 1.4 2014/07/25 16:23:35 jperkin Exp $
2 2
3--- mk/beforeauto.mk.in.orig 2010-11-22 23:00:44.000000000 +0000 3Ensure we set the correct rpaths.
 4
 5--- mk/beforeauto.mk.in.orig 2012-12-21 16:08:59.000000000 +0000
4+++ mk/beforeauto.mk.in 6+++ mk/beforeauto.mk.in
5@@ -768,6 +768,10 @@ IMPORT_CPPFLAGS += -D__linux__ 7@@ -778,6 +778,10 @@ IMPORT_CPPFLAGS += -D__linux__
6 OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10 8 OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10
7 OMNITHREAD_CPPFLAGS = -D_REENTRANT 9 OMNITHREAD_CPPFLAGS = -D_REENTRANT
8 OMNITHREAD_LIB += -lpthread 10 OMNITHREAD_LIB += -lpthread
9+ 11+
10+CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) 12+CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
11+CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) 13+CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
12+SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname 14+SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname
13 endif 15 endif
14  16
15 ################### 17 ###################
16@@ -1072,10 +1076,27 @@ OMNITHREAD_LIB += -pthread 18@@ -804,7 +808,7 @@ THREAD_LIB = -lthread $(CXXMTFLAG)
 19 OMNITHREAD_LIB += -lpthread -lposix4 $(CXXMTFLAG)
 20
 21 ifdef Compiler_GCC
 22-SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-h,$$soname
 23+SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-h,$$soname -Wl,-R$(INSTALLLIBDIR)
 24 endif
 25 ifdef Compiler_Sun5
 26 SharedLibraryPlatformLinkFlagsTemplate = -G -h $$soname
 27@@ -1088,10 +1092,27 @@ OMNITHREAD_LIB += -pthread
17 endif 28 endif
18  29
19 ################### 30 ###################
20+ifdef DragonFly 31+ifdef DragonFly
21+IMPORT_CPPFLAGS += -D__dragonfly__ 32+IMPORT_CPPFLAGS += -D__dragonfly__
22+ 33+
23+CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) 34+CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
24+CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) 35+CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
25+SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname 36+SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname
26+ 37+
27+OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE 38+OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
28+OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10 39+OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10
29+OMNITHREAD_LIB += -pthread 40+OMNITHREAD_LIB += -pthread