[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: 49bd23bbc1f76a9eaaf5159495cdd05f9fd10ff0
Author: Marek Szuba gentoo org>
AuthorDate: Tue Feb 7 11:28:43 2023 +
Commit: Marek Szuba gentoo org>
CommitDate: Tue Feb 7 11:28:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49bd23bb
dev-libs/msgpack: drop IUSE=static-libs support
The only revdep which used this has just ceased to do so, was a no-op in
3.3.0 to begin with.
Signed-off-by: Marek Szuba gentoo.org>
.../msgpack/files/msgpack-5.0.0-static_libs.patch | 38 --
dev-libs/msgpack/msgpack-3.3.0-r1.ebuild | 3 +-
dev-libs/msgpack/msgpack-5.0.0.ebuild | 7 +---
3 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
b/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
deleted file mode 100644
index e1ed2c2038a5..
--- a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,27 +82,6 @@
- OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage
report." OFF)
- ENDIF ()
-
--IF (DEFINED BUILD_SHARED_LIBS)
--IF (BUILD_SHARED_LIBS)
--IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED)
--MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to ON by
BUILD_SHARED_LIBS")
--ENDIF ()
--SET (MSGPACK_ENABLE_SHARED ON)
--IF (DEFINED MSGPACK_ENABLE_STATIC AND MSGPACK_ENABLE_STATIC)
--MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to OFF by
BUILD_SHARED_LIBS")
--ENDIF ()
--SET (MSGPACK_ENABLE_STATIC OFF)
--ELSE ()
--IF (DEFINED MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_SHARED)
--MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to OFF by
BUILD_SHARED_LIBS")
--ENDIF ()
--SET (MSGPACK_ENABLE_SHARED OFF)
--IF (DEFINED MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_STATIC)
--MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to ON by
BUILD_SHARED_LIBS")
--ENDIF ()
--SET (MSGPACK_ENABLE_STATIC ON)
--ENDIF ()
--ELSE ()
- IF (NOT DEFINED MSGPACK_ENABLE_SHARED)
- SET (MSGPACK_ENABLE_SHARED ON)
- ENDIF ()
-@@ -110,7 +89,6 @@
- SET (MSGPACK_ENABLE_STATIC ON)
- ENDIF ()
- SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED})
--ENDIF ()
-
- INCLUDE (Files.cmake)
-
diff --git a/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild
b/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild
index db548946d8c3..4c9eb713672c 100644
--- a/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://msgpack.org/
https://github.com/msgpack/msgpack-c/;
LICENSE="Boost-1.0"
SLOT="0/2"
-IUSE="boost +cxx doc examples static-libs test"
+IUSE="boost +cxx doc examples test"
RESTRICT="!test? ( test )"
BDEPEND="doc? ( app-doc/doxygen[dot] )"
@@ -35,7 +35,6 @@ multilib_src_configure() {
local mycmakeargs=(
-DMSGPACK_BOOST="$(usex boost)"
-DMSGPACK_ENABLE_CXX="$(usex cxx)"
- -DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
-DMSGPACK_BUILD_TESTS="$(usex test)"
# don't build the examples
-DMSGPACK_BUILD_EXAMPLES=OFF
diff --git a/dev-libs/msgpack/msgpack-5.0.0.ebuild
b/dev-libs/msgpack/msgpack-5.0.0.ebuild
index 14455fe7b732..cc6f586a055f 100644
--- a/dev-libs/msgpack/msgpack-5.0.0.ebuild
+++ b/dev-libs/msgpack/msgpack-5.0.0.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/c-${PV}/${MY_P}.tar.
LICENSE="Boost-1.0"
SLOT="0/2"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples static-libs test"
+IUSE="doc examples test"
RESTRICT="!test? ( test )"
@@ -25,17 +25,12 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )
sys-libs/zlib[${MULTILIB_USEDEP}]
)"
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0.0-static_libs.patch
-)
-
S="${WORKDIR}"/${MY_P}
multilib_src_configure() {
local mycmakeargs=(
-DMSGPACK_BUILD_EXAMPLES=OFF
-DMSGPACK_BUILD_TESTS="$(usex test)"
- -DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
)
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: c23fbbc365f94c571e705bb0a55d1b8b26f68d07
Author: Marek Szuba gentoo org>
AuthorDate: Sun Feb 5 21:39:13 2023 +
Commit: Marek Szuba gentoo org>
CommitDate: Sun Feb 5 21:59:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23fbbc3
dev-libs/msgpack-5.0.0: add *working* IUSE=static-libs
app-misc/tmate optionally relies on the availability of static
libmsgpack so until that dependency has been removed, keep this flag.
That said, having just tested it USE=static-libs is in fact a no-op
in case of =dev-libs/msgpack-3.3.0!
Signed-off-by: Marek Szuba gentoo.org>
.../msgpack/files/msgpack-5.0.0-static_libs.patch | 38 ++
dev-libs/msgpack/msgpack-5.0.0.ebuild | 7 +++-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
b/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
new file mode 100644
index ..e1ed2c2038a5
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch
@@ -0,0 +1,38 @@
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -82,27 +82,6 @@
+ OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage
report." OFF)
+ ENDIF ()
+
+-IF (DEFINED BUILD_SHARED_LIBS)
+-IF (BUILD_SHARED_LIBS)
+-IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED)
+-MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to ON by
BUILD_SHARED_LIBS")
+-ENDIF ()
+-SET (MSGPACK_ENABLE_SHARED ON)
+-IF (DEFINED MSGPACK_ENABLE_STATIC AND MSGPACK_ENABLE_STATIC)
+-MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to OFF by
BUILD_SHARED_LIBS")
+-ENDIF ()
+-SET (MSGPACK_ENABLE_STATIC OFF)
+-ELSE ()
+-IF (DEFINED MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_SHARED)
+-MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to OFF by
BUILD_SHARED_LIBS")
+-ENDIF ()
+-SET (MSGPACK_ENABLE_SHARED OFF)
+-IF (DEFINED MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_STATIC)
+-MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to ON by
BUILD_SHARED_LIBS")
+-ENDIF ()
+-SET (MSGPACK_ENABLE_STATIC ON)
+-ENDIF ()
+-ELSE ()
+ IF (NOT DEFINED MSGPACK_ENABLE_SHARED)
+ SET (MSGPACK_ENABLE_SHARED ON)
+ ENDIF ()
+@@ -110,7 +89,6 @@
+ SET (MSGPACK_ENABLE_STATIC ON)
+ ENDIF ()
+ SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED})
+-ENDIF ()
+
+ INCLUDE (Files.cmake)
+
diff --git a/dev-libs/msgpack/msgpack-5.0.0.ebuild
b/dev-libs/msgpack/msgpack-5.0.0.ebuild
index cc6f586a055f..14455fe7b732 100644
--- a/dev-libs/msgpack/msgpack-5.0.0.ebuild
+++ b/dev-libs/msgpack/msgpack-5.0.0.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/c-${PV}/${MY_P}.tar.
LICENSE="Boost-1.0"
SLOT="0/2"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
+IUSE="doc examples static-libs test"
RESTRICT="!test? ( test )"
@@ -25,12 +25,17 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )
sys-libs/zlib[${MULTILIB_USEDEP}]
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0.0-static_libs.patch
+)
+
S="${WORKDIR}"/${MY_P}
multilib_src_configure() {
local mycmakeargs=(
-DMSGPACK_BUILD_EXAMPLES=OFF
-DMSGPACK_BUILD_TESTS="$(usex test)"
+ -DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
)
cmake_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: 82f8868fd9f42fd4573357ceeae4354d9647f0c2
Author: Sam James gentoo org>
AuthorDate: Wed Sep 30 02:57:04 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Sep 30 02:57:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f8868f
dev-libs/msgpack: cleanup old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
dev-libs/msgpack/Manifest | 3 -
dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch | 25
dev-libs/msgpack/files/msgpack-1.0.0-static.patch | 40
dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch | 22 ---
dev-libs/msgpack/msgpack-1.1.0.ebuild | 47 --
dev-libs/msgpack/msgpack-3.1.1.ebuild | 75 ---
dev-libs/msgpack/msgpack-3.2.1.ebuild | 75 ---
7 files changed, 287 deletions(-)
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 1f7dbe990d5..d4d73cd4aaa 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,5 +1,2 @@
-DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B
3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c
SHA512
6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd252b9861a1e373901
-DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B
a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3
SHA512
cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B
6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478d60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14
SHA512
f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
-DIST msgpack-3.2.1.tar.gz 1234733 BLAKE2B
97fb6cab5125463f10e7ad2c55ee478b2bf3dab5628a40ce1b0bcdd96cc002f5c99e495592c91f1342e6623d32b5594536de226b0bf80e1cb5290dae9b0566dc
SHA512
68d06b05a1f00a3d9d7d39313a9e11f42828606c39d9d4c07673a48c9b88028a6316f2a964881cc8e4d185616a037711f02a7d3cd6029eadbacf52145603538b
DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B
3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32
SHA512
ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
deleted file mode 100644
index fc6cacd0a03..000
--- a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
msgpack-1.0.0/CMakeLists.txt
-+++ msgpack-1.0.0/CMakeLists.txt
-@@ -213,10 +213,6 @@
- ADD_SUBDIRECTORY (test)
- ENDIF ()
-
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}"
STREQUAL "GNU")
--SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall
-g -O3 -DPIC")
--SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -g -O3" )
--ENDIF ()
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
- STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS}")
msgpack-1.0.0/test/CMakeLists.txt
-+++ msgpack-1.0.0/test/CMakeLists.txt
-@@ -52,9 +52,6 @@
- ${CMAKE_THREAD_LIBS_INIT}
- )
- ADD_TEST (${source_file_we} ${source_file_we})
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
"${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY
COMPILE_FLAGS "-Wall -g -O3")
--ENDIF ()
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
- STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS}")
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
deleted file mode 100644
index e40a9deaaec..000
--- a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
msgpack-1.0.0/CMakeLists.txt
-+++ msgpack-1.0.0/CMakeLists.txt
-@@ -17,6 +17,7 @@
-
- OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
- OPTION (MSGPACK_32BIT "32bit compile" OFF)
-+OPTION (MSGPACK_STATIC "Build static library" ON)
-
- IF (MSGPACK_CXX11)
-IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-@@ -196,12 +197,15 @@
- ${msgpack_HEADERS}
- )
-
--ADD_LIBRARY (msgpack-static STATIC
--${msgpack_SOURCES}
--${msgpack_HEADERS}
--)
-+IF (MSGPACK_STATIC)
-+ADD_LIBRARY (msgpack-static STATIC
-+${msgpack_SOURCES}
-+${msgpack_HEADERS}
-+)
-+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: 56a2c31206d814cdce77666e70adcfd0364c1ce0
Author: Tim Harder gentoo org>
AuthorDate: Fri Dec 28 20:50:18 2018 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Dec 28 20:52:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a2c312
dev-libs/msgpack: remove old
Signed-off-by: Tim Harder gentoo.org>
dev-libs/msgpack/Manifest | 4 --
dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch | 32 --
dev-libs/msgpack/files/msgpack-1.4.2-static.patch | 46 -
dev-libs/msgpack/msgpack-1.4.2.ebuild | 78 ---
dev-libs/msgpack/msgpack-2.0.0.ebuild | 46 -
dev-libs/msgpack/msgpack-2.1.1.ebuild | 77 --
6 files changed, 283 deletions(-)
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 636a145ca55..2c31d5c6a9f 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,6 +1,2 @@
DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B
3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c
SHA512
6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd252b9861a1e373901
-DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B
c8605847aca3faa3aba2c573bc6f020fbfbc773e008c682978453ed353206cbb9d8ba4d521a11984f5bf7f9005b05f3ae33d6c48233f19b39f8b7f307031d36a
SHA512
c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548
-DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B
273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0
SHA512
7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
-DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B
24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08
SHA512
74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
-DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B
b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3
SHA512
31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B
a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3
SHA512
cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
b/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
deleted file mode 100644
index bb3bc6bcbc5..000
--- a/dev-libs/msgpack/files/msgpack-1.4.2-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a9b241..73fe07c 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -283,13 +283,6 @@ IF (MSGPACK_BUILD_TESTS)
- ADD_SUBDIRECTORY (test)
- ENDIF ()
-
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}"
STREQUAL "GNU")
--IF (MSGPACK_ENABLE_SHARED)
--SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -Wextra -Werror -g -O3 -DPIC")
--ENDIF ()
--SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS
"-Wall -Wextra -Werror -g -O3" )
--ENDIF ()
--
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS "
-Wno-mismatched-tags")
- ENDIF ()
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 5dfbbe4..5d1cb8a 100644
a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -74,9 +74,6 @@ FOREACH (source_file ${check_PROGRAMS})
- ${CMAKE_THREAD_LIBS_INIT}
- )
- ADD_TEST (${source_file_we} ${source_file_we})
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
"${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY
COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
--ENDIF ()
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY
COMPILE_FLAGS " -Wno-mismatched-tags")
- ENDIF ()
diff --git a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
b/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
deleted file mode 100644
index 994e9fbbc29..000
--- a/dev-libs/msgpack/files/msgpack-1.4.2-static.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a9b241..49b0405 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@
[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: d7a074a0f604e82fc81366acf250278d48d5eb48
Author: Patrice Clement gentoo org>
AuthorDate: Mon Dec 11 20:56:11 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 11 20:58:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a074a0
dev-libs/msgpack: pack oversized patch away into a tarball.
Closes: https://bugs.gentoo.org/640748
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-libs/msgpack/Manifest |1 +
.../msgpack-2.0.0-gcc7-implicit-fallthrough.patch | 1798
dev-libs/msgpack/msgpack-2.0.0.ebuild |7 +-
3 files changed, 6 insertions(+), 1800 deletions(-)
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 99c3d1999db..28aeda04320 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -3,5 +3,6 @@ DIST msgpack-1.0.0.tar.gz 478108 BLAKE2B
2e624184453e1de2a183a2d90b4c642861932a6
DIST msgpack-1.0.1.tar.gz 484598 BLAKE2B
d89e71897d2d7238911f98854927e2b4b934c60cdf497b0784857ed2151a3fd4c3926a8b95cddde31cc1dcef3483c407b03322c05992a737d73584f47cd8a9d9
SHA512
da20ddafe6ec4b61b1ea9cc9e79070c5ce7805974c0fd18ed46d6dc422732b93f29c6b28cf72ada3c0d55f00f8b17655538535f46a60252083e2afe12545
DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B
3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c
SHA512
6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd252b9861a1e373901
DIST msgpack-1.4.2.tar.gz 776384 BLAKE2B
c8605847aca3faa3aba2c573bc6f020fbfbc773e008c682978453ed353206cbb9d8ba4d521a11984f5bf7f9005b05f3ae33d6c48233f19b39f8b7f307031d36a
SHA512
c2da1d3bcc4e3dbcd93e005c63796e52e071d47ccd18434d4d3483b2e8255cf89ade746392decaa50e3911ca0134bb0da88b3b2ada9acfba0d331dfd48843548
+DIST msgpack-2.0.0-patchset.tar.bz2 1645 BLAKE2B
273faa0fe88f4da06b57b7deb02de77191bdb6c5ca76d314043636979157b879f73cbcb0a0b931cecb3eb0f706b3c6cce0e42350eebf20c44503393504c9edb0
SHA512
7b40b0e6675b333bdbf3d811e47a55e35c4aa136e378966ce3e5f42aaf6de57d883db71ed5c189c6da1803d6725847db23f6fdf1cc0cdc921d3cadcf245545c4
DIST msgpack-2.0.0.tar.gz 446063 BLAKE2B
24bb0657dc8f190740ae3f91541f702d9954e1ff6c12931c43911556a1d34634882dd59678e5aae4a4b55733620a1445c2fef0379be9454b0fa32ce5d7515f08
SHA512
74d1c9641ecdf1a54346088c59415cf778821dc6f6acb0c5a8a93c2284edaf53c4746459093971d96136279fbd8de10cb9a43dd8d8220d335618ad30e971e9a3
DIST msgpack-2.1.1.tar.gz 460168 BLAKE2B
b6e3746033e4779139c5efe0d48eb00e19badff17f910f5a5cdba8ebdccb178f88cbb4e6e85687e4a2ddb0d5c9e6b53dec1e4cc2cee070b5e51e38c5a67b0ad3
SHA512
31ed6fda498d43da6fdbbe000ce36c40e4cf886f00d879c57d406def7f5bba4eaf66f02f221398cb50f6f4c748d5cde9c97eca0cfa21b368c7c933c3301cf9b5
diff --git
a/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
b/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
deleted file mode 100644
index 1562c036268..000
--- a/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
+++ /dev/null
@@ -1,1798 +0,0 @@
-diff -aurP msgpack-2.0.0/erb/v1/cpp03_define_array.hpp.erb
msgpack-2.0.0.new/erb/v1/cpp03_define_array.hpp.erb
msgpack-2.0.0/erb/v1/cpp03_define_array.hpp.erb2016-06-18
18:20:36.0 -0500
-+++ msgpack-2.0.0.new/erb/v1/cpp03_define_array.hpp.erb2017-08-01
17:20:57.803000361 -0500
-@@ -66,7 +66,9 @@
- msgpack::object *ptr = o.via.array.ptr;
- switch(size) {
- default:<%(i).downto(0) {|j|%>
--case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);<%}%>
-+case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);
-+// fallthrough
-+<%}%>
- }
- }
- }
-diff -aurP msgpack-2.0.0/include/msgpack/unpack_template.h
msgpack-2.0.0.new/include/msgpack/unpack_template.h
msgpack-2.0.0/include/msgpack/unpack_template.h2016-05-27
21:10:28.0 -0500
-+++ msgpack-2.0.0.new/include/msgpack/unpack_template.h2017-08-01
17:20:49.389000738 -0500
-@@ -248,6 +248,7 @@
-
- _fixed_trail_again:
- ++p;
-+// fallthrough
-
- default:
- if((size_t)(pe - p) < trail) { goto _out; }
-diff -aurP
msgpack-2.0.0/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
msgpack-2.0.0.new/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
msgpack-2.0.0/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
2016-06-24 21:16:43.0 -0500
-+++ msgpack-2.0.0.new/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
2017-08-01 17:23:32.690993409 -0500
-@@ -67,6 +67,8 @@
- switch(size) {
- default:
- case 1: ptr[0].convert(a0);
-+// fallthrough
-+
- }
- }
- }
-@@ -105,7 +107,9 @@
- switch(size) {
- default:
- case 2:
[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: c5158d02c671493bb76ceb11fc657128f7341d16
Author: Marty Plummer gmail com>
AuthorDate: Tue Aug 1 22:52:31 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Aug 14 22:22:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5158d02
dev-libs/msgpack: fix -Wimplicit-fallthrough bug.
Patches taken from upstream and rebased against this particular
release. Future releases should not require this patch, and it
only affects formatting.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5273
.../msgpack-2.0.0-gcc7-implicit-fallthrough.patch | 1798
dev-libs/msgpack/msgpack-2.0.0.ebuild |4 +
2 files changed, 1802 insertions(+)
diff --git
a/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
b/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
new file mode 100644
index 000..1562c036268
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-2.0.0-gcc7-implicit-fallthrough.patch
@@ -0,0 +1,1798 @@
+diff -aurP msgpack-2.0.0/erb/v1/cpp03_define_array.hpp.erb
msgpack-2.0.0.new/erb/v1/cpp03_define_array.hpp.erb
+--- msgpack-2.0.0/erb/v1/cpp03_define_array.hpp.erb2016-06-18
18:20:36.0 -0500
msgpack-2.0.0.new/erb/v1/cpp03_define_array.hpp.erb2017-08-01
17:20:57.803000361 -0500
+@@ -66,7 +66,9 @@
+ msgpack::object *ptr = o.via.array.ptr;
+ switch(size) {
+ default:<%(i).downto(0) {|j|%>
+-case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);<%}%>
++case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);
++// fallthrough
++<%}%>
+ }
+ }
+ }
+diff -aurP msgpack-2.0.0/include/msgpack/unpack_template.h
msgpack-2.0.0.new/include/msgpack/unpack_template.h
+--- msgpack-2.0.0/include/msgpack/unpack_template.h2016-05-27
21:10:28.0 -0500
msgpack-2.0.0.new/include/msgpack/unpack_template.h2017-08-01
17:20:49.389000738 -0500
+@@ -248,6 +248,7 @@
+
+ _fixed_trail_again:
+ ++p;
++// fallthrough
+
+ default:
+ if((size_t)(pe - p) < trail) { goto _out; }
+diff -aurP
msgpack-2.0.0/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
msgpack-2.0.0.new/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
+--- msgpack-2.0.0/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
2016-06-24 21:16:43.0 -0500
msgpack-2.0.0.new/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
2017-08-01 17:23:32.690993409 -0500
+@@ -67,6 +67,8 @@
+ switch(size) {
+ default:
+ case 1: ptr[0].convert(a0);
++// fallthrough
++
+ }
+ }
+ }
+@@ -105,7 +107,9 @@
+ switch(size) {
+ default:
+ case 2: ptr[1].convert(a1);
++// fallthrough
+ case 1: ptr[0].convert(a0);
++// fallthrough
+ }
+ }
+ }
+@@ -147,8 +151,14 @@
+ switch(size) {
+ default:
+ case 3: ptr[2].convert(a2);
++// fallthrough
++
+ case 2: ptr[1].convert(a1);
++// fallthrough
++
+ case 1: ptr[0].convert(a0);
++// fallthrough
++
+ }
+ }
+ }
+@@ -193,9 +203,13 @@
+ switch(size) {
+ default:
+ case 4: ptr[3].convert(a3);
++// fallthrough
+ case 3: ptr[2].convert(a2);
++// fallthrough
+ case 2: ptr[1].convert(a1);
++// fallthrough
+ case 1: ptr[0].convert(a0);
++// fallthrough
+ }
+ }
+ }
+@@ -243,10 +257,20 @@
+ switch(size) {
+ default:
+ case 5: ptr[4].convert(a4);
++// fallthrough
++
+ case 4: ptr[3].convert(a3);
++// fallthrough
++
+ case 3: ptr[2].convert(a2);
++// fallthrough
++
+ case 2: ptr[1].convert(a1);
++// fallthrough
++
+ case 1: ptr[0].convert(a0);
++// fallthrough
++
+ }
+ }
+ }
+@@ -297,11 +321,23 @@
+ switch(size) {
+ default:
+ case 6: ptr[5].convert(a5);
++// fallthrough
++
+ case 5: ptr[4].convert(a4);
++// fallthrough
++
+ case 4: ptr[3].convert(a3);
++// fallthrough
++
+ case 3: ptr[2].convert(a2);
++// fallthrough
++
+ case 2: ptr[1].convert(a1);
++// fallthrough
++
+ case 1: ptr[0].convert(a0);
++// fallthrough
++
+ }
+ }
+ }
+@@ -355,12 +391,26 @@
+ switch(size) {
+ default:
+ case 7: ptr[6].convert(a6);
++// fallthrough
++
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/msgpack/files/, dev-libs/msgpack/
commit: 42a9bc145ce5188ad3852261c912314960581665
Author: Peter Levine gmail com>
AuthorDate: Tue Jul 25 03:00:32 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Jul 25 21:52:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a9bc14
dev-libs/msgpack: fix building with GCC-6.
Gentoo-Bug: https://bugs.gentoo.org/623492
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5206
dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch | 22 ++
dev-libs/msgpack/msgpack-1.1.0.ebuild | 6 +-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
new file mode 100644
index 000..2fc9bb46e4b
--- /dev/null
+++ b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/623492
+Backported from:
https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de
+
+--- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
+@@ -46,13 +46,14 @@
+ public:
+ using base = std::tuple;
+
+-using base::base;
+
+-tuple() = default;
+ tuple(tuple const&) = default;
+ tuple(tuple&&) = default;
+
+ template
++tuple(OtherTypes&&... other):base(std::forward(other)...)
{}
++
++template
+ tuple(tuple const&
other):base(static_cast(other)) {}
+ template
+ tuple(tuple &&
other):base(static_cast(other)) {}
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild
b/dev-libs/msgpack/msgpack-1.1.0.ebuild
index e9316807c0c..0743ad515c8 100644
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-libs/msgpack/msgpack-1.1.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+
inherit cmake-multilib
if [[ ${PV} == ]]; then
@@ -27,9 +28,11 @@ DEPEND="
"
DOCS=( README.md )
+
PATCHES=(
"${FILESDIR}"/${PN}-1.0.0-cflags.patch
"${FILESDIR}"/${PN}-1.0.0-static.patch
+ "${FILESDIR}"/${P}-gcc6.patch
)
src_configure() {
@@ -38,5 +41,6 @@ src_configure() {
$(cmake-utils_use static-libs MSGPACK_STATIC)
$(cmake-utils_use test MSGPACK_BUILD_TESTS)
)
+
cmake-multilib_src_configure
}
