diff options
| author | tegge <tegge@FreeBSD.org> | 2004-03-22 04:22:14 +0800 |
|---|---|---|
| committer | tegge <tegge@FreeBSD.org> | 2004-03-22 04:22:14 +0800 |
| commit | 665fc95aafc9ea0f61fb54defef6a940195149da (patch) | |
| tree | 65fe3a7b7d1de5eb1c62379ded6ad62a0bfe288f | |
| parent | c96641828689cd599a75f4086c6dec1edc39d7ff (diff) | |
| download | freebsd-ports-gnome-665fc95aafc9ea0f61fb54defef6a940195149da.tar.gz freebsd-ports-gnome-665fc95aafc9ea0f61fb54defef6a940195149da.tar.zst freebsd-ports-gnome-665fc95aafc9ea0f61fb54defef6a940195149da.zip | |
Stop wrapping gethost* functions on 5.2-CURRENT.
| -rw-r--r-- | devel/linuxthreads/Makefile | 3 | ||||
| -rw-r--r-- | devel/linuxthreads/files/gethostby_r.c | 4 | ||||
| -rw-r--r-- | devel/linuxthreads/files/patch-aa | 12 |
3 files changed, 17 insertions, 2 deletions
diff --git a/devel/linuxthreads/Makefile b/devel/linuxthreads/Makefile index 3ab6136a0480..1a9e5a51182e 100644 --- a/devel/linuxthreads/Makefile +++ b/devel/linuxthreads/Makefile @@ -7,7 +7,7 @@ PORTNAME= linuxthreads PORTVERSION= 2.2.3 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= glibc @@ -177,6 +177,7 @@ pre-build: .endif pre-install: + ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 ${PREFIX}/lib @cd ${WRKSRC}/libgcc_r ; \ ${SETENV} ${MAKE_ENV} ${MAKE} install .if defined(USING_GCC3) diff --git a/devel/linuxthreads/files/gethostby_r.c b/devel/linuxthreads/files/gethostby_r.c index 44aa5227225b..8a171aac05c3 100644 --- a/devel/linuxthreads/files/gethostby_r.c +++ b/devel/linuxthreads/files/gethostby_r.c @@ -7,6 +7,8 @@ #define NEED_ALIGNED_ACCESS #endif +#if __FreeBSD_version < 502104 + static pthread_mutex_t gethostby_mutex = PTHREAD_MUTEX_INITIALIZER; static int @@ -166,3 +168,5 @@ gethostent_r (struct hostent *result, char *buffer, int buflen, pthread_mutex_unlock (&gethostby_mutex); return result; } + +#endif /* #if __FreeBSD_version < 502104 */ diff --git a/devel/linuxthreads/files/patch-aa b/devel/linuxthreads/files/patch-aa index 1eaa73d68cdb..58e262ed0b75 100644 --- a/devel/linuxthreads/files/patch-aa +++ b/devel/linuxthreads/files/patch-aa @@ -332,9 +332,11 @@ diff -ru ../../work/linuxthreads-2.2.3/cancel.c ./cancel.c diff -ru ../../work/linuxthreads-2.2.3/errno.c ./errno.c --- ../../work/linuxthreads-2.2.3/errno.c Sat Dec 4 20:31:49 1999 +++ ./errno.c Thu Jun 7 22:59:29 2001 -@@ -19,13 +19,13 @@ +@@ -18,14 +18,17 @@ + #include <netdb.h> #include "pthread.h" #include "internals.h" ++#include <osreldate.h> -int * __errno_location() +int * __error() @@ -344,10 +346,18 @@ diff -ru ../../work/linuxthreads-2.2.3/errno.c ./errno.c } -int * __h_errno_location() ++#if __FreeBSD_version < 502104 ++ +int * __h_error() { pthread_descr self = thread_self(); return THREAD_GETMEM (self, p_h_errnop); +@@ -37,3 +40,5 @@ + pthread_descr self = thread_self(); + return THREAD_GETMEM (self, p_resp); + } ++ ++#endif /* #if __FreeBSD_version < 502104 */ diff -ru ../../work/linuxthreads-2.2.3/internals.h ./internals.h --- ../../work/linuxthreads-2.2.3/internals.h Wed Apr 25 21:50:59 2001 +++ ./internals.h Thu Jun 7 22:59:29 2001 |