Skip to contentSkip to conversation

msgpack: bump version to 2.1.5

PATCH New Bradford Barr 3 participants 4 messages Sep 18, 2017 – Oct 8, 2017

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 msgpack: bump version to 2.1.5

From: bradford barr <[email protected]>

Modern versions of msgpack are hosted on Github. Msgpack switched their build systems from autotools to cmake a while back. The licence was also updated from Apache to Boost.

---
 package/msgpack/msgpack.hash |  2 +-
 package/msgpack/msgpack.mk   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
package/msgpack/msgpack.hash +1 -1
index 8cd8cb6..f1033ad 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  97a371ef950c89f48e8dba6abeccab07f1887e9ba6dab921de0f985c7d5075fe  msgpack-0.5.4.tar.gz
+sha256  9c87f80fc651b900772deaef0ab154b63160c74d292529b5be6d06d6485d4640  msgpack-2.1.5.tar.gz
package/msgpack/msgpack.mk +9 -4
index 9e23948..66dbc8d 100644
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
-MSGPACK_VERSION = 0.5.4
-MSGPACK_SITE = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp
-MSGPACK_LICENSE = Apache-2.0
+MSGPACK_VERSION = 2.1.5
+MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION))
+MSGPACK_LICENSE = BSL-1.0
 MSGPACK_LICENSE_FILES = COPYING
+MSGPACK_INSTALL_STAGING = YES
 
-$(eval $(autotools-package))
+define MSGPACK_INSTALL_TARGET_CMDS
+	cp -a $(@D)/libmsgpackc.so* $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(cmake-package))
Signature · 1 line
2.9.3
#1 lore raw

PATCH v2 1/1 msgpack: bump version to 2.1.5

I was about to apply, however:

Quoted 31 lines · Bradford Barr

From: bradford barr <[email protected]>

Modern versions of msgpack are hosted on Github. Msgpack switched their build systems from autotools to cmake a while back. The licence was also updated from Apache to Boost.

---
 package/msgpack/msgpack.hash |  2 +-
 package/msgpack/msgpack.mk   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
package/msgpack/msgpack.hash +1 -1
index 8cd8cb6..f1033ad 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  97a371ef950c89f48e8dba6abeccab07f1887e9ba6dab921de0f985c7d5075fe  msgpack-0.5.4.tar.gz
+sha256  9c87f80fc651b900772deaef0ab154b63160c74d292529b5be6d06d6485d4640  msgpack-2.1.5.tar.gz
package/msgpack/msgpack.mk +0 -3
index 9e23948..66dbc8d 100644
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
-MSGPACK_VERSION = 0.5.4
-MSGPACK_SITE = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp
-MSGPACK_LICENSE = Apache-2.0

package/msgpack/msgpack.mk line 15

Quoted 10 lines
package/msgpack/msgpack.mk +7 -1
+MSGPACK_VERSION = 2.1.5
+MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION))
+MSGPACK_LICENSE = BSL-1.0
 MSGPACK_LICENSE_FILES = COPYING
+MSGPACK_INSTALL_STAGING = YES
 
-$(eval $(autotools-package))
+define MSGPACK_INSTALL_TARGET_CMDS
+	cp -a $(@D)/libmsgpackc.so* $(TARGET_DIR)/usr/lib
+endef

Why does the default "make install" not work?

Quoted 3 lines
package/msgpack/msgpack.mk +2 -0
+
+$(eval $(cmake-package))
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#2 lore raw

PATCH v2 1/1 msgpack: bump version to 2.1.5

Quoted 40 lines · Arnout Vandecappelle

I was about to apply, however:

Quoted 37 lines · Bradford Barr

From: bradford barr <[email protected]>

Modern versions of msgpack are hosted on Github. Msgpack switched their build systems from autotools to cmake a while back. The licence was also updated from Apache to Boost.

---
 package/msgpack/msgpack.hash |  2 +-
 package/msgpack/msgpack.mk   | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
package/msgpack/msgpack.hash +1 -1
index 8cd8cb6..f1033ad 100644
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  97a371ef950c89f48e8dba6abeccab07f1887e9ba6dab921de0f985c7d5075fe  msgpack-0.5.4.tar.gz
+sha256  9c87f80fc651b900772deaef0ab154b63160c74d292529b5be6d06d6485d4640  msgpack-2.1.5.tar.gz
package/msgpack/msgpack.mk +4 -3
index 9e23948..66dbc8d 100644
@@ -4,9 +4,14 @@
 #
 ################################################################################
 
-MSGPACK_VERSION = 0.5.4
-MSGPACK_SITE = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp
-MSGPACK_LICENSE = Apache-2.0
+MSGPACK_VERSION = 2.1.5
+MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION))
+MSGPACK_LICENSE = BSL-1.0
 MSGPACK_LICENSE_FILES = COPYING
+MSGPACK_INSTALL_STAGING = YES
 
Quoted 6 lines

package/msgpack/msgpack.mk line 15

Quoted 4 lines
package/msgpack/msgpack.mk +3 -1
-$(eval $(autotools-package))
+define MSGPACK_INSTALL_TARGET_CMDS
+     cp -a $(@D)/libmsgpackc.so* $(TARGET_DIR)/usr/lib
+endef

Why does the default "make install" not work?

The default "make install" installs all of the header files, cmake modules, pkg-config files, and the static library along side the dynamic libraries. I figured it'd be best if the package just installed the dynamic libraries on the target. Let me know if you'd prefer the default "make install".

Quoted 6 lines

package/msgpack/msgpack.mk line 17

Quoted 5 lines
package/msgpack/msgpack.mk +2 -0
+
+$(eval $(cmake-package))
Quoted 7 lines

--

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Thanks,
B

#3 lore raw

PATCH v2 1/1 msgpack: bump version to 2.1.5

Hello,

Quoted 5 lines · Bradford Barr

The default "make install" installs all of the header files, cmake modules, pkg-config files, and the static library along side the dynamic libraries. I figured it'd be best if the package just installed the dynamic libraries on the target. Let me know if you'd prefer the default "make install".

What you did is not needed at all: Buildroot already removes header files, pkg-config files, static libraries, etc. from $(TARGET_DIR) at the end of the build.

If you drop your custom installation command, here is what is left from msgpack in $(TARGET_DIR) at the end of the buid:

output/target/usr/lib/libmsgpackc.so
output/target/usr/lib/libmsgpackc.so.2.0.0
output/target/usr/lib/libmsgpackc.so.2

Which is exactly what we want.

Also, I've added LICENSE_1_0.txt to the list of license files, because COPYING was not very useful by itself.

Applied with those changes. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com