diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
| commit | af591191d2b91375c67ab57df64d383e66055294 (patch) | |
| tree | ddbacf3026d39d6b23e622ac51745a4f7db32d44 /net/ORBit | |
| parent | 675d464c92282081571087f8ad824d1cae9d8414 (diff) | |
| download | pkgsrc-af591191d2b91375c67ab57df64d383e66055294.tar.gz | |
Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk. Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).
Diffstat (limited to 'net/ORBit')
| -rw-r--r-- | net/ORBit/Makefile | 8 | ||||
| -rw-r--r-- | net/ORBit/distinfo | 4 | ||||
| -rw-r--r-- | net/ORBit/patches/patch-af | 11 |
3 files changed, 8 insertions, 15 deletions
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 936752e58b8..74f0f4ee8a8 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2004/10/03 00:17:48 tv Exp $ +# $NetBSD: Makefile,v 1.108 2004/11/12 06:39:20 jlam Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -30,8 +30,6 @@ CONFIGURE_ENV+= LIB_WRAP="-lwrap" PKGCONFIG_OVERRIDE+= ORBit.pc.in PKGCONFIG_OVERRIDE+= libIDL/libIDL.pc.in -CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 - # for DISTNAME, PKGNAME ORBIT_MAJOR= 5 ORBIT_MINOR= 15 @@ -43,4 +41,8 @@ INFO_FILES= libIDL.info .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.if ${PTHREAD_TYPE} != "native" +CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo index 830c21cfa8f..cde8aadae4a 100644 --- a/net/ORBit/distinfo +++ b/net/ORBit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2003/12/16 11:22:31 sketch Exp $ +$NetBSD: distinfo,v 1.21 2004/11/12 06:39:20 jlam Exp $ SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes @@ -7,7 +7,7 @@ SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422 SHA1 (patch-ac) = 49bc73c9e6d9b369ca9f44630be75539252e3df7 SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb -SHA1 (patch-af) = db34a280931fd2274b05f47751aab34234cab4f4 +SHA1 (patch-af) = 53be67746a3488a899e887de416d940f884f80d7 SHA1 (patch-ag) = 875e83a597ab39d57abcfd9259d8ec15707ea45c SHA1 (patch-ai) = 06e1cb2bc9f4f5460cdde71526417cdaa38ff310 SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de diff --git a/net/ORBit/patches/patch-af b/net/ORBit/patches/patch-af index b5f3a3e390c..32bb9281550 100644 --- a/net/ORBit/patches/patch-af +++ b/net/ORBit/patches/patch-af @@ -1,16 +1,7 @@ -$NetBSD: patch-af,v 1.8 2003/07/11 23:38:46 grant Exp $ +$NetBSD: patch-af,v 1.9 2004/11/12 06:39:20 jlam Exp $ --- src/IIOP/Makefile.in.orig Mon Jan 7 18:23:54 2002 +++ src/IIOP/Makefile.in Thu Apr 4 12:30:24 2002 -@@ -128,7 +128,7 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ $(PTHREAD_LDFLAGS) - @HAVE_HOSTS_ACCESS_TRUE@libIIOP_la_DEPENDENCIES = $(addsuffix .lo, \ - @HAVE_HOSTS_ACCESS_TRUE@$(basename $(filter %.o, $(shell ar t \ - @HAVE_HOSTS_ACCESS_TRUE@$(LIBWRAP_PATH))))) @@ -399,8 +399,11 @@ make_libwrap_files: $(LIBWRAP_PATH) |