Attachment 205849 Details for Bug 226400 – google-cloud-cpp.shar

google-cloud-cpp.shar

google-cloud-cpp.shar (text/plain), 8.04 KB, created by Yuri Victorovich on 2019-07-17 19:33:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2019-07-17 19:33:18 UTC

Size: 8.04 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	devel/google-cloud-cpp
>#	devel/google-cloud-cpp/files
>#	devel/google-cloud-cpp/files/patch-cmake_GoogleCloudCppCommon.cmake
>#	devel/google-cloud-cpp/files/patch-cmake_downloadNlohmannJson.cmake
>#	devel/google-cloud-cpp/files/patch-google_cloud_storage_cmakelists.txt
>#	devel/google-cloud-cpp/files/patch-cmake_external_googleapis.cmake
>#	devel/google-cloud-cpp/Makefile
>#	devel/google-cloud-cpp/distinfo
>#	devel/google-cloud-cpp/pkg-descr
>#
>echo c - devel/google-cloud-cpp
>mkdir -p devel/google-cloud-cpp > /dev/null 2>&1
>echo c - devel/google-cloud-cpp/files
>mkdir -p devel/google-cloud-cpp/files > /dev/null 2>&1
>echo x - devel/google-cloud-cpp/files/patch-cmake_GoogleCloudCppCommon.cmake
>sed 's/^X//' >devel/google-cloud-cpp/files/patch-cmake_GoogleCloudCppCommon.cmake << '840b5e355566a5905b4df37096dd3aa6'
>X--- cmake/GoogleCloudCppCommon.cmake.orig	2019-07-12 21:04:09.526957000 +0100
>X+++ cmake/GoogleCloudCppCommon.cmake	2019-07-12 21:05:37.289511000 +0100
>X@@ -24,7 +24,6 @@
>X if (NOT MSVC)
>X     check_cxx_compiler_flag(-Wall GOOGLE_CLOUD_CPP_COMPILER_SUPPORTS_WALL)
>X     check_cxx_compiler_flag(-Wextra GOOGLE_CLOUD_CPP_COMPILER_SUPPORTS_WEXTRA)
>X-    check_cxx_compiler_flag(-Werror GOOGLE_CLOUD_CPP_COMPILER_SUPPORTS_WERROR)
>X else()
>X     check_cxx_compiler_flag("/std:c++latest"
>X                             GOOGLE_CLOUD_CPP_COMPILER_SUPPORTS_CPP_LATEST)
>X@@ -118,9 +117,6 @@
>X     endif ()
>X     if (GOOGLE_CLOUD_CPP_COMPILER_SUPPORTS_WEXTRA)
>X         target_compile_options(${target} INTERFACE "-Wextra")
>X-    endif ()
>X-    if (GOOGLE_CLOUD_CPP_COMPILER_SUPPORTS_WERROR)
>X-        target_compile_options(${target} INTERFACE "-Werror")
>X     endif ()
>X     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"
>X         AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 5.0)
>840b5e355566a5905b4df37096dd3aa6
>echo x - devel/google-cloud-cpp/files/patch-cmake_downloadNlohmannJson.cmake
>sed 's/^X//' >devel/google-cloud-cpp/files/patch-cmake_downloadNlohmannJson.cmake << 'fe074ef80fd0d4ffe2a163b2f8895117'
>X--- cmake/DownloadNlohmannJson.cmake.orig
>X+++ cmake/DownloadNlohmannJson.cmake
>X@@ -37,6 +37,10 @@ function (_download_json_hpp)
>X             execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep
>X                                     "${sleep_seconds}")
>X         endif ()
>X+        if (EXISTS "${DEST}/json.hpp")
>X+            set(download_error_code 0)
>X+            break()
>X+        endif ()
>X         file(DOWNLOAD "${JSON_URL}" "${DEST}/json.hpp" STATUS download_status)
>X         list(GET download_status 0 download_error_code)
>X         if (download_error_code EQUAL 0)
>X
>fe074ef80fd0d4ffe2a163b2f8895117
>echo x - devel/google-cloud-cpp/files/patch-google_cloud_storage_cmakelists.txt
>sed 's/^X//' >devel/google-cloud-cpp/files/patch-google_cloud_storage_cmakelists.txt << 'a34c63c42012e7720ced472920d6b13e'
>X--- google/cloud/storage/CMakeLists.txt.orig	2019-01-30 14:01:05.657031402 +0800
>X+++ google/cloud/storage/CMakeLists.txt	2019-01-30 14:01:19.969968164 +0800
>X@@ -215,9 +215,6 @@
>X                              Crc32c::crc32c
>X                              CURL::CURL
>X                              Threads::Threads
>X-                             OpenSSL::SSL
>X-                             OpenSSL::Crypto
>X-                             ZLIB::ZLIB
>X                       PRIVATE storage_common_options)
>X target_include_directories(storage_client
>X                            PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
>X
>a34c63c42012e7720ced472920d6b13e
>echo x - devel/google-cloud-cpp/files/patch-cmake_external_googleapis.cmake
>sed 's/^X//' >devel/google-cloud-cpp/files/patch-cmake_external_googleapis.cmake << 'c7b71136bf05256ec94538626cb622e1'
>XWorkaround for the upstream bug
>Xhttps://github.com/googleapis/google-cloud-cpp/issues/2875 (Installs files into the same directory where build is performed from)
>Xsuggested by Anthony <amzo1337@gmail.com>.
>X
>XDOESN'T WORK!
>X
>X--- cmake/external/googleapis.cmake.orig	2019-07-17 17:31:29 UTC
>X+++ cmake/external/googleapis.cmake
>X@@ -109,7 +109,7 @@ if (NOT TARGET googleapis_project)
>X                    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
>X                    -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
>X                    -DCMAKE_PREFIX_PATH=${GOOGLE_CLOUD_CPP_PREFIX_PATH}
>X-                   -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
>X+                   -DCMAKE_INSTALL_PREFIX=%%LOCALBASE%%
>X                    -DCMAKE_INSTALL_RPATH=${GOOGLE_CLOUD_CPP_INSTALL_RPATH}
>X                    ${_googleapis_toolchain_flag}
>X                    ${_googleapis_triplet_flag}
>c7b71136bf05256ec94538626cb622e1
>echo x - devel/google-cloud-cpp/Makefile
>sed 's/^X//' >devel/google-cloud-cpp/Makefile << 'dd39b3e56e5bf8dc5259672228d789d3'
>X# $FreeBSD$
>X
>XPORTNAME=	google-cloud-cpp
>XDISTVERSIONPREFIX=	v
>XDISTVERSION=	0.11.0.g20190710 # the master is mis-labeled: https://github.com/googleapis/google-cloud-cpp/issues/2871
>XCATEGORIES=	devel
>XEXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>XDIST_SUBDIR=	${PORTNAME}
>X
>XDISTFILES=	a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz:googleapi \
>X		json.hpp:json
>XMASTER_SITES=	https://github.com/googleapis/googleapis/archive/:googleapi \
>X		https://github.com/nlohmann/json/releases/download/v3.4.0/:json # should use the package: https://github.com/googleapis/google-cloud-cpp/issues/2874
>X
>XMAINTAINER=	amzo1337@gmail.com
>XCOMMENT=	C++ Idiomatic Clients for Google Cloud Platform services
>X
>XLICENSE=	BSD3CLAUSE
>XLICENSE_FILE=	${WRKSRC}/LICENSE
>X
>XBUILD_DEPENDS=	protobuf>=3.7.1:devel/protobuf \
>X		grpc>=1.19.1:devel/grpc
>XLIB_DEPENDS=	libcrc32c.so:devel/crc32c \
>X		libcurl.so:ftp/curl \
>X		libgrpc.so:devel/grpc \
>X		libprotobuf.so:devel/protobuf
>X
>XUSES=		cmake compiler:c++11-lang ssl
>XUSE_GITHUB=	yes
>XGH_TAGNAME=	4dff795ca
>XGH_ACCOUNT=	GoogleCloudPlatform
>XUSE_LDCONFIG=	yes
>X
>XCFLAGS+=	-I${WRKDIR}/.build/external/googleapis/src/googleapis_project-build
>XLDFLAGS+=	-L${WRKDIR}/.build/external/googleapis/src/googleapis_project-build
>X
>XCMAKE_ON=	BUILD_SHARED_LIBS
>XCMAKE_OFF=	BUILD_TESTING GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS
>XCMAKE_ARGS=	-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
>X
>Xpost-extract:
>X	@${MKDIR} ${BUILD_WRKSRC}/external/nlohmann_json/src/
>X	@${CP} ${DISTDIR}/${DIST_SUBDIR}/json.hpp ${BUILD_WRKSRC}/external/nlohmann_json/src/json.hpp
>X	@${MKDIR} ${BUILD_WRKSRC}/external/googleapis/src/
>X	@${CP} ${DISTDIR}/${DIST_SUBDIR}/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz \
>X		${BUILD_WRKSRC}/external/googleapis/src/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz
>X
>X.include <bsd.port.mk>
>dd39b3e56e5bf8dc5259672228d789d3
>echo x - devel/google-cloud-cpp/distinfo
>sed 's/^X//' >devel/google-cloud-cpp/distinfo << 'b130a2c796214e1806c5c3e7b2049006'
>XTIMESTAMP = 1563091031
>XSHA256 (google-cloud-cpp/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz) = 6b8a9b2bcb4476e9a5a9872869996f0d639c8d5df76dd8a893e79201f211b1cf
>XSIZE (google-cloud-cpp/a8ee1416f4c588f2ab92da72e7c1f588c784d3e6.tar.gz) = 1493736
>XSHA256 (google-cloud-cpp/json.hpp) = 63da6d1f22b2a7bb9e4ff7d6b255cf691a161ff49532dcc45d398a53e295835f
>XSIZE (google-cloud-cpp/json.hpp) = 705920
>XSHA256 (google-cloud-cpp/GoogleCloudPlatform-google-cloud-cpp-v0.11.0.g20190710-4dff795ca_GH0.tar.gz) = 00a6355ae09b9f1708e87747835f8cb2e8de8351a0f836ff6954a6809ef81d73
>XSIZE (google-cloud-cpp/GoogleCloudPlatform-google-cloud-cpp-v0.11.0.g20190710-4dff795ca_GH0.tar.gz) = 2230947
>b130a2c796214e1806c5c3e7b2049006
>echo x - devel/google-cloud-cpp/pkg-descr
>sed 's/^X//' >devel/google-cloud-cpp/pkg-descr << '14f00d492d64376bf459cc39bffc07d3'
>XNsync is a C library that exports various synchronization primitives.
>XThe library is intended to be portable, and to be compilable on a system with
>Xonly a C90 compiler, assuming atomic operations are available from the
>Xcompiler, operating system, or assembler routines.  It is able to use C11 or
>XC++11 atomic operations if they are available.
>X
>XWWW: https://github.com/google/nsync
>14f00d492d64376bf459cc39bffc07d3
>exit
>

Actions: View

Attachments on bug 226400: 193882 | 194004 | 205760 | 205845 | 205849 | 206152