head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.94 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.92 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.90 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.88 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.86 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.84 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.82 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.80 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.78 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.76 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.74 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.72 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.70 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.68 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.66 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.64 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.62 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.60 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.58 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.56 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.54 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.52 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.50 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.46 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.26 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.48 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.44 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.42 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.40 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.38 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.36 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.34 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.32 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.30 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.28 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.24 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.22 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.20 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.18 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.16 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.14 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.12 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.10 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.8 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.6 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.4 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.2 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.3.0.20 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.18 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.16 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.14 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.10 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.6 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.4 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.2.0.10 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.8 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.6 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.4 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.2 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.1.1.1.0.2 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2014.07.25.16.23.35; author jperkin; state Exp; branches; next 1.3; commitid z3wKEm18CKFRgMJx; 1.3 date 2012.01.29.04.03.17; author sbd; state Exp; branches; next 1.2; 1.2 date 2011.01.01.05.43.28; author obache; state Exp; branches; next 1.1; 1.1 date 2010.09.01.15.52.58; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2010.09.01.15.52.58; author drochner; state Exp; branches; next ; desc @@ 1.4 log @Ensure we set rpath in SunOS build, fixes check-shlibs. @ text @$NetBSD: patch-ae,v 1.3 2012/01/29 04:03:17 sbd Exp $ Ensure we set the correct rpaths. --- mk/beforeauto.mk.in.orig 2012-12-21 16:08:59.000000000 +0000 +++ mk/beforeauto.mk.in @@@@ -778,6 +778,10 @@@@ IMPORT_CPPFLAGS += -D__linux__ OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=10 OMNITHREAD_CPPFLAGS = -D_REENTRANT OMNITHREAD_LIB += -lpthread + +CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) +CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) +SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname endif ################### @@@@ -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 ################### +ifdef DragonFly +IMPORT_CPPFLAGS += -D__dragonfly__ + +CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) +CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) +SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname + +OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE +OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10 +OMNITHREAD_LIB += -pthread +endif + +################### ifdef NetBSD IMPORT_CPPFLAGS += -D__netbsd__ -OMNITHREAD_CPPFLAGS = -D_REENTRANT +CLINKOPTIONS = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) +CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR) +SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname + +OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10 OMNITHREAD_LIB += -pthread endif @ 1.3 log @Copy the link options for NetBSD in mk/beforeauto.mk.in to the Linux section so that the library's get the rpath embedded. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2011/01/01 05:43:28 obache Exp $ d3 3 a5 1 --- mk/beforeauto.mk.in.orig 2010-11-22 23:00:44.000000000 +0000 d7 1 a7 1 @@@@ -768,6 +768,10 @@@@ IMPORT_CPPFLAGS += -D__linux__ d18 10 a27 1 @@@@ -1072,10 +1076,27 @@@@ OMNITHREAD_LIB += -pthread @ 1.2 log @Add DragonFly support. (for patch-ad, NetBSD support is already in, reuse for DragonFly). @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $ d3 1 a3 1 --- mk/beforeauto.mk.in.orig 2009-06-18 08:45:32.000000000 +0000 d5 12 a16 1 @@@@ -1062,10 +1062,27 @@@@ OMNITHREAD_LIB += -pthread @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- mk/beforeauto.mk.in.orig 2007-05-11 12:17:21.000000000 +0200 d5 17 a21 1 @@@@ -1030,7 +1030,11 @@@@ endif @ 1.1.1.1 log @add omniORB-4.1.4, a CORBA implementation, from Ian Zagorskih per pkgsrc-wip @ text @@