Date: Mon, 27 Mar 2017 16:06:19 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437055 - in head/devel/nspr: . files Message-ID: <201703271606.v2RG6J3M059005@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Mar 27 16:06:19 2017 New Revision: 437055 URL: https://svnweb.freebsd.org/changeset/ports/437055 Log: devel/nspr: use localtime_r and PTHREAD_MUTEX_ADAPTIVE_NP Added: head/devel/nspr/files/patch-bug1350414 (contents, props changed) head/devel/nspr/files/patch-bug1350966 (contents, props changed) Modified: head/devel/nspr/Makefile (contents, props changed) Modified: head/devel/nspr/Makefile ============================================================================== --- head/devel/nspr/Makefile Mon Mar 27 15:51:56 2017 (r437054) +++ head/devel/nspr/Makefile Mon Mar 27 16:06:19 2017 (r437055) @@ -3,6 +3,7 @@ PORTNAME= nspr DISTVERSION= 4.14 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src Added: head/devel/nspr/files/patch-bug1350414 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/nspr/files/patch-bug1350414 Mon Mar 27 16:06:19 2017 (r437055) @@ -0,0 +1,55 @@ +--- configure~ ++++ configure +@@ -6730,6 +6730,8 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5 + + $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + ++ $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h ++ + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + if test "$MOZ_OBJFORMAT" = "elf"; then +@@ -7340,6 +7342,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." + + $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + ++ $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h ++ + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + fi +@@ -7396,6 +7400,8 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool." + + $as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h + ++ $as_echo "#define HAVE_POINTER_LOCALTIME_R 1" >>confdefs.h ++ + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" + DLL_SUFFIX=so.1.0 +--- configure.in~ ++++ configure.in +@@ -1554,6 +1554,7 @@ tools are selected during the Xcode/Developer Tools installation.]) + AC_DEFINE(FREEBSD) + AC_DEFINE(HAVE_BSD_FLOCK) + AC_DEFINE(HAVE_SOCKLEN_T) ++ AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + if test "$MOZ_OBJFORMAT" = "elf"; then +@@ -2114,6 +2115,7 @@ tools are selected during the Xcode/Developer Tools installation.]) + AC_DEFINE(NETBSD) + AC_DEFINE(HAVE_BSD_FLOCK) + AC_DEFINE(HAVE_SOCKLEN_T) ++ AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + if test -z "$USE_NSPR_THREADS"; then + USE_PTHREADS=1 + fi +@@ -2162,6 +2164,7 @@ tools are selected during the Xcode/Developer Tools installation.]) + AC_DEFINE(OPENBSD) + AC_DEFINE(HAVE_BSD_FLOCK) + AC_DEFINE(HAVE_SOCKLEN_T) ++ AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + CFLAGS="$CFLAGS -ansi -Wall" + CXXFLAGS="$CXXFLAGS -ansi -Wall" + DLL_SUFFIX=so.1.0 Added: head/devel/nspr/files/patch-bug1350966 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/nspr/files/patch-bug1350966 Mon Mar 27 16:06:19 2017 (r437055) @@ -0,0 +1,17 @@ +--- pr/src/pthreads/ptsynch.c~ ++++ pr/src/pthreads/ptsynch.c +@@ -55,12 +55,11 @@ void _PR_InitLocks(void) + rv = _PT_PTHREAD_MUTEXATTR_INIT(&_pt_mattr); + PR_ASSERT(0 == rv); + +-#ifdef LINUX +-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) ++#if (defined(LINUX) && (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) || \ ++ (defined(FREEBSD) && __FreeBSD_version > 700055) + rv = pthread_mutexattr_settype(&_pt_mattr, PTHREAD_MUTEX_ADAPTIVE_NP); + PR_ASSERT(0 == rv); + #endif +-#endif + + rv = _PT_PTHREAD_CONDATTR_INIT(&_pt_cvar_attr); + PR_ASSERT(0 == rv);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703271606.v2RG6J3M059005>