diff options
| author | sbd <sbd@pkgsrc.org> | 2012-01-29 04:03:17 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-01-29 04:03:17 +0000 |
| commit | e157ef539d1503f3458b6b6a7dcc2d00fe3484cd (patch) | |
| tree | 24c631402fb9fef06c510c887512cd3b1b3c135f /net | |
| parent | 687a6830f31849a47a6cb9bac1404a64be0dfb3c (diff) | |
| download | pkgsrc-e157ef539d1503f3458b6b6a7dcc2d00fe3484cd.tar.gz | |
Copy the link options for NetBSD in mk/beforeauto.mk.in to the Linux section
so that the library's get the rpath embedded.
Diffstat (limited to 'net')
| -rw-r--r-- | net/omniORB/distinfo | 4 | ||||
| -rw-r--r-- | net/omniORB/patches/patch-ae | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/net/omniORB/distinfo b/net/omniORB/distinfo index 2f2707c53da..3359d74a846 100644 --- a/net/omniORB/distinfo +++ b/net/omniORB/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2011/04/21 16:34:17 drochner Exp $ +$NetBSD: distinfo,v 1.4 2012/01/29 04:03:17 sbd Exp $ SHA1 (omniORB-4.1.5.tar.bz2) = 6114f0f11dfb059324fae9401faeac67d2adf792 RMD160 (omniORB-4.1.5.tar.bz2) = b71bde35fe45ca1b64d9a78d4b152a7d962dee67 @@ -7,4 +7,4 @@ SHA1 (patch-aa) = 679f8f8da61c1e5106ae40067c7d8f5dcc1576d4 SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80 -SHA1 (patch-ae) = 6249b22ce41528e42672f8159eb50dc01999256a +SHA1 (patch-ae) = a7090d82ea71fc96deecb463e1262b83f15a8bb2 diff --git a/net/omniORB/patches/patch-ae b/net/omniORB/patches/patch-ae index 8faa66d3262..a0235b15115 100644 --- a/net/omniORB/patches/patch-ae +++ b/net/omniORB/patches/patch-ae @@ -1,8 +1,19 @@ -$NetBSD: patch-ae,v 1.2 2011/01/01 05:43:28 obache Exp $ +$NetBSD: patch-ae,v 1.3 2012/01/29 04:03:17 sbd Exp $ ---- mk/beforeauto.mk.in.orig 2009-06-18 08:45:32.000000000 +0000 +--- mk/beforeauto.mk.in.orig 2010-11-22 23:00:44.000000000 +0000 +++ mk/beforeauto.mk.in -@@ -1062,10 +1062,27 @@ OMNITHREAD_LIB += -pthread +@@ -768,6 +768,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 + + ################### +@@ -1072,10 +1076,27 @@ OMNITHREAD_LIB += -pthread endif ################### |