diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2006-01-18 20:04:24 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2006-01-18 20:04:24 +0000 |
| commit | a60e09632b57b5ed60c1d163bc6590093d9a6a16 (patch) | |
| tree | b3c2a92d9f76796d3de11a2aec2127d3a381f028 /net-p2p/mldonkey-devel | |
| parent | dea3c8eceda923777cb33f0b90782b48e1970dbb (diff) | |
| download | ports-a60e09632b57b5ed60c1d163bc6590093d9a6a16.tar.gz ports-a60e09632b57b5ed60c1d163bc6590093d9a6a16.zip | |
1) Make sure that multithreaded coding using
gethostbyname(3)/gethostbyaddr(3) is used under FreeBSD.
2) Futhermore, insure that it is properly detected whether reentrant
versions of the aforementioned functions are available; and,
that the appropriate code is used on either case.
3) Bump PORTREVISION
Submitted by: spiralvoice <spiralvoice@users.sourceforge.net> [1]
Reviewed by: freebsd-ports (3 days silence)
Notes
Notes:
svn path=/head/; revision=153834
Diffstat (limited to 'net-p2p/mldonkey-devel')
| -rw-r--r-- | net-p2p/mldonkey-devel/Makefile | 7 | ||||
| -rw-r--r-- | net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c | 46 |
2 files changed, 52 insertions, 1 deletions
diff --git a/net-p2p/mldonkey-devel/Makefile b/net-p2p/mldonkey-devel/Makefile index 87176430379d..c0f2b5019996 100644 --- a/net-p2p/mldonkey-devel/Makefile +++ b/net-p2p/mldonkey-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= mldonkey PORTVERSION= 2.7.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -90,6 +90,11 @@ PKGMESSAGE= ${WRKDIR}/pkg-message USE_GCC= 3.4 .endif +# FreeBSD has reentrant dns code +.if ( ((${OSVERSION} >= 504102) && (${OSVERSION} < 600000)) || (${OSVERSION} >= 600029) ) +PTHREAD_CFLAGS+= -D_REENTRANT +.endif + ### Development version ## Thus, we will use non standard threading library ## We will switch from libpthread to libthr which should produce diff --git a/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c new file mode 100644 index 000000000000..1bbdf74dc821 --- /dev/null +++ b/net-p2p/mldonkey-devel/files/patch-src__utils__lib__stubs_c.c @@ -0,0 +1,46 @@ +--- src/utils/lib/stubs_c.c.orig Wed Jan 4 12:23:37 2006 ++++ src/utils/lib/stubs_c.c Mon Jan 16 14:14:38 2006 +@@ -28,6 +28,11 @@ + #include <inttypes.h> + #endif + ++/* For proper FreeBSD version identification */ ++#if defined(HAVE_SYS_PARAM_H) ++#include <sys/param.h> ++#endif ++ + #define lseek XXXXXXXXX + #define read XXXXXXXXX + #define ftruncate XXXXXXXXX +@@ -683,7 +688,7 @@ + + #define NETDB_BUFFER_SIZE 10000 + +-#ifdef _WIN32 ++#if ( defined(__FreeBSD_version) && ( ((__FreeBSD_version >= 504102) && (__FreeBSD_version < 600000)) || (__FreeBSD_version >= 600029) ) ) + #define GETHOSTBYADDR_IS_REENTRANT 1 + #define GETHOSTBYNAME_IS_REENTRANT 1 + #endif +@@ -738,11 +743,11 @@ + if (rc != 0) hp = NULL; + } + #else +-#ifdef GETHOSTBYNAME_IS_REENTRANT ++#ifndef GETHOSTBYNAME_IS_REENTRANT + enter_blocking_section(); + #endif + hp = gethostbyname(hostname); +-#ifdef GETHOSTBYNAME_IS_REENTRANT ++#ifndef GETHOSTBYNAME_IS_REENTRANT + leave_blocking_section(); + #endif + #endif +@@ -787,7 +792,7 @@ + End_roots(); + } + +-#if !defined(HAVE_PTHREAD) || !(HAS_GETHOSTBYNAME_R || GETHOSTBYNAME_IS_REENTRANT) ++#if !defined(HAVE_PTHREAD) || (!(HAS_GETHOSTBYNAME_R || GETHOSTBYNAME_IS_REENTRANT) && !defined(HAS_SIGWAIT)) + + value ml_ip_job_start(value job_v) + { |