Date: Wed, 16 Dec 2015 09:36:25 +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: r403850 - in head/devel: android-tools-adb-devel/files android-tools-adb/files android-tools-simpleperf/files Message-ID: <201512160936.tBG9aPXS055668@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Dec 16 09:36:24 2015 New Revision: 403850 URL: https://svnweb.freebsd.org/changeset/ports/403850 Log: devel/android-tools-*: drop FreeBSD 8.x support Modified: head/devel/android-tools-adb-devel/files/patch-base_logging.cpp (contents, props changed) head/devel/android-tools-adb/files/patch-libcutils_threads.c (contents, props changed) head/devel/android-tools-simpleperf/files/patch-libcutils_threads.c (contents, props changed) Modified: head/devel/android-tools-adb-devel/files/patch-base_logging.cpp ============================================================================== --- head/devel/android-tools-adb-devel/files/patch-base_logging.cpp Wed Dec 16 09:35:57 2015 (r403849) +++ head/devel/android-tools-adb-devel/files/patch-base_logging.cpp Wed Dec 16 09:36:24 2015 (r403850) @@ -1,14 +1,12 @@ --- base/logging.cpp.orig 2015-12-14 21:12:52 UTC +++ base/logging.cpp -@@ -66,6 +68,16 @@ +@@ -66,6 +68,14 @@ #include <unistd.h> #elif defined(_WIN32) #include <windows.h> +#elif defined(__DragonFly__) +#include <unistd.h> +#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> +#include <pthread_np.h> +#elif defined(__NetBSD__) +#include <lwp.h> @@ -17,7 +15,7 @@ #endif static pid_t GetThreadId() { -@@ -77,6 +89,20 @@ static pid_t GetThreadId() { +@@ -77,6 +89,14 @@ static pid_t GetThreadId() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -26,13 +24,7 @@ +#elif defined(__NetBSD__) + return _lwp_self(); +#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif ++ return pthread_getthreadid_np(); +#else + return (intptr_t) pthread_self(); #endif Modified: head/devel/android-tools-adb/files/patch-libcutils_threads.c ============================================================================== --- head/devel/android-tools-adb/files/patch-libcutils_threads.c Wed Dec 16 09:35:57 2015 (r403849) +++ head/devel/android-tools-adb/files/patch-libcutils_threads.c Wed Dec 16 09:36:24 2015 (r403850) @@ -1,14 +1,12 @@ --- libcutils/threads.c.orig 2015-06-17 22:20:38 UTC +++ libcutils/threads.c -@@ -29,6 +29,16 @@ +@@ -29,6 +29,14 @@ #include <unistd.h> #elif defined(_WIN32) #include <windows.h> +#elif defined(__DragonFly__) +#include <unistd.h> +#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> +#include <pthread_np.h> +#elif defined(__NetBSD__) +#include <lwp.h> @@ -17,7 +15,7 @@ #endif // No definition needed for Android because we'll just pick up bionic's copy. -@@ -40,6 +48,20 @@ pid_t gettid() { +@@ -40,6 +48,14 @@ pid_t gettid() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -26,13 +24,7 @@ +#elif defined(__NetBSD__) + return _lwp_self(); +#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif ++ return pthread_getthreadid_np(); +#else + return (intptr_t) pthread_self(); #endif Modified: head/devel/android-tools-simpleperf/files/patch-libcutils_threads.c ============================================================================== --- head/devel/android-tools-simpleperf/files/patch-libcutils_threads.c Wed Dec 16 09:35:57 2015 (r403849) +++ head/devel/android-tools-simpleperf/files/patch-libcutils_threads.c Wed Dec 16 09:36:24 2015 (r403850) @@ -1,21 +1,19 @@ --- libcutils/threads.c.orig 2015-08-12 23:28:08 UTC +++ libcutils/threads.c -@@ -29,6 +29,14 @@ +@@ -29,6 +29,12 @@ #include <unistd.h> #elif defined(_WIN32) #include <windows.h> +#elif defined(__DragonFly__) +#include <unistd.h> +#elif defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/thr.h> +#include <pthread_np.h> +#elif defined(__NetBSD__) +#include <lwp.h> #endif // No definition needed for Android because we'll just pick up bionic's copy. -@@ -40,6 +48,20 @@ pid_t gettid() { +@@ -40,6 +48,14 @@ pid_t gettid() { return syscall(__NR_gettid); #elif defined(_WIN32) return GetCurrentThreadId(); @@ -24,13 +22,7 @@ +#elif defined(__NetBSD__) + return _lwp_self(); +#elif defined(__FreeBSD__) -+# if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+# else -+ long lwpid; -+ thr_self(&lwpid); -+ return lwpid; -+# endif ++ return pthread_getthreadid_np(); +#else + return (intptr_t) pthread_self(); #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512160936.tBG9aPXS055668>