Date: Mon, 21 Mar 2016 18:45:59 +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: r411610 - in head/devel/android-tools-simpleperf: . files Message-ID: <201603211845.u2LIjxRI080424@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Mar 21 18:45:59 2016 New Revision: 411610 URL: https://svnweb.freebsd.org/changeset/ports/411610 Log: devel/android-tools-simpleperf: update to n.p.1.116 Changes: https://android.googlesource.com/platform/system/extras/+log/4ea2a41..ea4a5a4/simpleperf Added: head/devel/android-tools-simpleperf/files/patch-base_include_android-base_logging.h (contents, props changed) - copied, changed from r411552, head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h Deleted: head/devel/android-tools-simpleperf/files/patch-base_include_base_logging.h head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h Modified: head/devel/android-tools-simpleperf/Makefile (contents, props changed) head/devel/android-tools-simpleperf/distinfo (contents, props changed) head/devel/android-tools-simpleperf/files/Makefile (contents, props changed) head/devel/android-tools-simpleperf/files/patch-base_logging.cpp (contents, props changed) Modified: head/devel/android-tools-simpleperf/Makefile ============================================================================== --- head/devel/android-tools-simpleperf/Makefile Mon Mar 21 18:04:09 2016 (r411609) +++ head/devel/android-tools-simpleperf/Makefile Mon Mar 21 18:45:59 2016 (r411610) @@ -2,23 +2,26 @@ PORTNAME= android-tools-simpleperf DISTVERSIONPREFIX= android- -DISTVERSION= m-preview-752 -DISTVERSIONSUFFIX= -g4ea2a41 +DISTVERSION= n-preview-1-116 +DISTVERSIONSUFFIX= -gea4a5a4 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Android simpleperf tool -LICENSE= APACHE20 +LICENSE= APACHE20 PD +LICENSE_COMB= multi +LICENSE_FILE_PD= ${WRKSRC}/lzma/NOTICE BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} USE_GITHUB= yes -GH_ACCOUNT= android:bionic,core jbeich +GH_ACCOUNT= android:bionic,core jbeich:DEFAULT,lzma GH_PROJECT= platform_bionic:bionic platform_system_core:core \ - platform_system_extras -GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-2178-g1721be2:bionic \ - ${DISTVERSIONFULL:C/-[0-9].*//}-4458-g2470439:core + platform_system_extras platform_external_lzma:lzma +GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9]*-g.*$//}-249-g5f1de52:bionic \ + ${DISTVERSIONFULL:C/-[0-9]*-g.*$//}-554-g371e7ea170d7:core \ + ${DISTVERSIONFULL:C/-[0-9]*-g.*$//}-6-ge43f249:lzma USES= compiler:c++11-lib uidfix BUILD_WRKSRC= ${WRKSRC}/simpleperf @@ -31,7 +34,7 @@ TEST_TARGET= test LDFLAGS+= -Wl,--as-needed # avoid overlinking (llvm deps) PLIST_FILES= bin/simpleperf -LLVM_VER?= 36 # XXX Move to DEFAULT_VERSIONS +LLVM_VER?= 38 # XXX Move to DEFAULT_VERSIONS OPTIONS_DEFINE= TEST @@ -42,6 +45,7 @@ post-extract: # Adjust paths relative to extras @(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC}) @${MV} ${WRKSRC_bionic} ${WRKSRC}/bionic + @${MV} ${WRKSRC_lzma} ${WRKSRC}/lzma post-patch: # XXX C++ exception with description "regex_error" thrown in the test body. Modified: head/devel/android-tools-simpleperf/distinfo ============================================================================== --- head/devel/android-tools-simpleperf/distinfo Mon Mar 21 18:04:09 2016 (r411609) +++ head/devel/android-tools-simpleperf/distinfo Mon Mar 21 18:45:59 2016 (r411610) @@ -1,6 +1,8 @@ -SHA256 (jbeich-platform_system_extras-android-m-preview-752-g4ea2a41_GH0.tar.gz) = 710286e8500c08f7b6d8fc0df6512a056200d036e0d17275a0c432a48a57f7d9 -SIZE (jbeich-platform_system_extras-android-m-preview-752-g4ea2a41_GH0.tar.gz) = 76520660 -SHA256 (android-platform_bionic-android-m-preview-2178-g1721be2_GH0.tar.gz) = 2ebe79bf3b31b025e286add79a45d4e2f867c9ed7e20658ac21235b257dde48d -SIZE (android-platform_bionic-android-m-preview-2178-g1721be2_GH0.tar.gz) = 3473156 -SHA256 (android-platform_system_core-android-m-preview-4458-g2470439_GH0.tar.gz) = 43a05eb7849232d60f309bdf0b7d8136b0ce4308845c9b60273964cec93c7b1d -SIZE (android-platform_system_core-android-m-preview-4458-g2470439_GH0.tar.gz) = 1374376 +SHA256 (jbeich-platform_system_extras-android-n-preview-1-116-gea4a5a4_GH0.tar.gz) = 6bfedb3758797d21c901daff05f3b0a29785e5cee241ceeb9a14524e7166676d +SIZE (jbeich-platform_system_extras-android-n-preview-1-116-gea4a5a4_GH0.tar.gz) = 76583329 +SHA256 (android-platform_bionic-android-n-preview-1-249-g5f1de52_GH0.tar.gz) = f82cc222e0de014fa8752b622073af6be748136a5aefd498a171b34948cc5785 +SIZE (android-platform_bionic-android-n-preview-1-249-g5f1de52_GH0.tar.gz) = 3492411 +SHA256 (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.tar.gz) = 6672ae5e1088335f2f721b357f178163c19259abe38a8b307ebb0c8b37b291cb +SIZE (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.tar.gz) = 1536079 +SHA256 (jbeich-platform_external_lzma-android-n-preview-1-6-ge43f249_GH0.tar.gz) = 176f7ad8c41794e144da17d3263e4a95b13528b9a425e80882e9ee4cbe2e5f9a +SIZE (jbeich-platform_external_lzma-android-n-preview-1-6-ge43f249_GH0.tar.gz) = 704323 Modified: head/devel/android-tools-simpleperf/files/Makefile ============================================================================== --- head/devel/android-tools-simpleperf/files/Makefile Mon Mar 21 18:04:09 2016 (r411609) +++ head/devel/android-tools-simpleperf/files/Makefile Mon Mar 21 18:45:59 2016 (r411610) @@ -14,6 +14,7 @@ SRCS+= event_attr.cpp SRCS+= event_type.cpp SRCS+= main.cpp SRCS+= perf_regs.cpp +SRCS+= read_apk.cpp SRCS+= read_elf.cpp SRCS+= record.cpp SRCS+= record_file_reader.cpp @@ -21,12 +22,16 @@ SRCS+= sample_tree.cpp SRCS+= thread_tree.cpp SRCS+= utils.cpp +TEST_SRCS+= cmd_report_test.cpp TEST_SRCS+= command_test.cpp +TEST_SRCS+= gtest_main.cpp +TEST_SRCS+= read_apk_test.cpp +TEST_SRCS+= read_elf_test.cpp TEST_SRCS+= record_test.cpp TEST_SRCS+= sample_tree_test.cpp -.PATH: ${.CURDIR}/darwin_support -SRCS+= darwin_support.cpp +.PATH: ${.CURDIR}/nonlinux_support +SRCS+= nonlinux_support.cpp # required by simpleperf .PATH: ${.CURDIR}/../base @@ -38,7 +43,6 @@ TEST_SRCS+= file_test.cpp TEST_SRCS+= logging_test.cpp TEST_SRCS+= stringprintf_test.cpp TEST_SRCS+= strings_test.cpp -TEST_SRCS+= test_main.cpp TEST_SRCS+= test_utils.cpp # required by base @@ -51,13 +55,45 @@ CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVIC .PATH: ${.CURDIR}/../libcutils SRCS+= threads.c +# required by libziparchive +.PATH: ${.CURDIR}/../libutils +SRCS+= FileMap.cpp + +# required by simpleperf +.PATH: ${.CURDIR}/../libziparchive +SRCS+= zip_archive.cc + +# required by simpleperf +.PATH: ${.CURDIR}/../lzma/C +SRCS+= 7zCrc.c +SRCS+= 7zCrcOpt.c +SRCS+= Bra86.c +SRCS+= Bra.c +SRCS+= BraIA64.c +SRCS+= CpuArch.c +SRCS+= Delta.c +SRCS+= Lzma2Dec.c +SRCS+= LzmaDec.c +SRCS+= Sha256.c +SRCS+= Xz.c +SRCS+= XzCrc64.c +SRCS+= XzCrc64Opt.c +SRCS+= XzDec.c + +CPPFLAGS+= -D_7ZIP_ST CPPFLAGS+= -D_WITH_GETLINE CPPFLAGS+= -DUSE_BIONIC_UAPI_HEADERS +CPPFLAGS+= -Doff64_t=off_t +CPPFLAGS+= -Dftruncate64=ftruncate +CPPFLAGS+= -Dlseek64=lseek +CPPFLAGS+= -Dmmap64=mmap +CPPFLAGS+= -Dpread64=pread CPPFLAGS+= -I${.CURDIR} -CPPFLAGS+= -I${.CURDIR}/darwin_support/include +CPPFLAGS+= -I${.CURDIR}/nonlinux_support/include CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../base/include CPPFLAGS+= -I${.CURDIR}/../bionic/libc/kernel +CPPFLAGS+= -I${.CURDIR}/../lzma/C CPPFLAGS+= $$(${LLVM_CONFIG} --cppflags) CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}} CXXFLAGS+= -std=gnu++11 @@ -84,7 +120,7 @@ GTEST_CONFIG?= gtest-config .include <bsd.prog.mk> test: ${PROG}_test - @for f in ${.ALLSRC}; do ./$$f; done + @for f in ${.ALLSRC}; do ./$$f -t ${.CURDIR}/testdata; done ${PROG}_test: ${OBJS:Nmain.o} ${TEST_OBJS} ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD} Copied and modified: head/devel/android-tools-simpleperf/files/patch-base_include_android-base_logging.h (from r411552, head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h) ============================================================================== Modified: head/devel/android-tools-simpleperf/files/patch-base_logging.cpp ============================================================================== --- head/devel/android-tools-simpleperf/files/patch-base_logging.cpp Mon Mar 21 18:04:09 2016 (r411609) +++ head/devel/android-tools-simpleperf/files/patch-base_logging.cpp Mon Mar 21 18:45:59 2016 (r411610) @@ -16,3 +16,33 @@ #include <iostream> #include <limits> #include <sstream> +@@ -66,6 +68,14 @@ + #include <unistd.h> + #elif defined(_WIN32) + #include <windows.h> ++#elif defined(__DragonFly__) ++#include <unistd.h> ++#elif defined(__FreeBSD__) ++#include <pthread_np.h> ++#elif defined(__NetBSD__) ++#include <lwp.h> ++#else ++#include <stdint.h> + #endif + + static pid_t GetThreadId() { +@@ -77,6 +89,14 @@ static pid_t GetThreadId() { + return syscall(__NR_gettid); + #elif defined(_WIN32) + return GetCurrentThreadId(); ++#elif defined(__DragonFly__) ++ return lwp_gettid(); ++#elif defined(__NetBSD__) ++ return _lwp_self(); ++#elif defined(__FreeBSD__) ++ 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?201603211845.u2LIjxRI080424>