Index: head/devel/android-tools-simpleperf/Makefile =================================================================== --- head/devel/android-tools-simpleperf/Makefile (revision 411609) +++ head/devel/android-tools-simpleperf/Makefile (revision 411610) @@ -1,56 +1,60 @@ # $FreeBSD$ 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 INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_VER}" ALL_TARGET= all 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 TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= simpleperf_test 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. @if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \ ${REINPLACE_CMD} -Ee '/^TEST/\ s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \ ${WRKSRC}/base/logging_test.cpp; \ fi pre-install-TEST-on: do-test .include Index: head/devel/android-tools-simpleperf/distinfo =================================================================== --- head/devel/android-tools-simpleperf/distinfo (revision 411609) +++ head/devel/android-tools-simpleperf/distinfo (revision 411610) @@ -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 Index: head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h =================================================================== --- head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h (revision 411609) +++ head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h (nonexistent) @@ -1,10 +0,0 @@ ---- simpleperf/record.h.orig 2015-10-26 20:57:19 UTC -+++ simpleperf/record.h -@@ -20,6 +20,7 @@ - #include - #include - -+#include // unique_ptr - #include - #include - #include Property changes on: head/devel/android-tools-simpleperf/files/patch-simpleperf_record.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/android-tools-simpleperf/files/patch-base_include_base_logging.h =================================================================== --- head/devel/android-tools-simpleperf/files/patch-base_include_base_logging.h (revision 411609) +++ head/devel/android-tools-simpleperf/files/patch-base_include_base_logging.h (nonexistent) @@ -1,10 +0,0 @@ ---- base/include/base/logging.h.orig 2015-08-12 23:28:08 UTC -+++ base/include/base/logging.h -@@ -25,6 +25,7 @@ - #endif - #endif - -+#include // errno - #include - #include - #include Property changes on: head/devel/android-tools-simpleperf/files/patch-base_include_base_logging.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/android-tools-simpleperf/files/Makefile =================================================================== --- head/devel/android-tools-simpleperf/files/Makefile (revision 411609) +++ head/devel/android-tools-simpleperf/files/Makefile (revision 411610) @@ -1,90 +1,126 @@ # $FreeBSD$ PROG_CXX=simpleperf NO_MAN= BINDIR?=/usr/bin SRCS+= callchain.cpp SRCS+= cmd_dumprecord.cpp SRCS+= cmd_help.cpp SRCS+= cmd_report.cpp SRCS+= command.cpp SRCS+= dso.cpp 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 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 SRCS+= file.cpp SRCS+= logging.cpp SRCS+= stringprintf.cpp SRCS+= strings.cpp 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 .PATH: ${.CURDIR}/../liblog SRCS+= fake_log_device.c SRCS+= logd_write.c CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1 # required by base .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 .ifndef COMPILE.c CFLAGS+= ${CPPFLAGS} CXXFLAGS+= ${CPPFLAGS} .endif TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags) .for f in ${TEST_SRCS} CPPFLAGS.${f}+= ${TEST_CPPFLAGS} .endfor LDADD+= $$(${LLVM_CONFIG} --system-libs --libs --ldflags) TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/} CLEANFILES+= ${PROG}_test ${TEST_OBJS} LLVM_CONFIG?= llvm-config GTEST_CONFIG?= gtest-config .include 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} Index: head/devel/android-tools-simpleperf/files/patch-base_include_android-base_logging.h =================================================================== --- head/devel/android-tools-simpleperf/files/patch-base_include_android-base_logging.h (nonexistent) +++ head/devel/android-tools-simpleperf/files/patch-base_include_android-base_logging.h (revision 411610) @@ -0,0 +1,11 @@ +--- base/include/android-base/logging.h.orig 2015-09-29 18:07:07 UTC ++++ base/include/android-base/logging.h +@@ -25,6 +25,8 @@ + #endif + #endif + ++#include ++ + #include + #include + #include Property changes on: head/devel/android-tools-simpleperf/files/patch-base_include_android-base_logging.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/android-tools-simpleperf/files/patch-base_logging.cpp =================================================================== --- head/devel/android-tools-simpleperf/files/patch-base_logging.cpp (revision 411609) +++ head/devel/android-tools-simpleperf/files/patch-base_logging.cpp (revision 411610) @@ -1,18 +1,48 @@ --- base/logging.cpp.orig 2015-08-12 23:28:08 UTC +++ base/logging.cpp @@ -23,12 +23,14 @@ #include // For getprogname(3) or program_invocation_short_name. -#if defined(__ANDROID__) || defined(__APPLE__) +#if !defined(_WIN32) && !defined(__GLIBC__) #include #elif defined(__GLIBC__) #include #endif +#include // strlen +#include // fprintf #include #include #include +@@ -66,6 +68,14 @@ + #include + #elif defined(_WIN32) + #include ++#elif defined(__DragonFly__) ++#include ++#elif defined(__FreeBSD__) ++#include ++#elif defined(__NetBSD__) ++#include ++#else ++#include + #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 + } +