NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5e25490fc4
kumquat-buildroot/package/hiredis/hiredis.mk

70 lines
2.0 KiB
Makefile
Raw Normal View History

hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
################################################################################
#
# hiredis
#
################################################################################
package/hiredis: bump to version 0.14.0 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-01-14 07:52:10 +01:00
HIREDIS_VERSION_MAJOR = 0.14
package/hiredis: security bump to version 0.14.1 - Fix CVE-2020-7105: async.c and dict.c in libhiredis.a in hiredis through 0.14.0 allow a NULL pointer dereference because malloc return values are unchecked. - Update indentation of hash file (two spaces) Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-03-28 09:52:30 +01:00
HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).1
package: remove 'v' prefix from github-fetched packages On Github, a large number of projects name their tag vXYZ (i.e v3.0, v0.1, etc.). In some packages we do: <pkg>_VERSION = v0.3 <pkg>_SITE = $(call github foo,bar,$(<pkg>_VERSION)) And in some other packages we do: <pkg>_VERSION = 0.3 <pkg>_SITE = $(call github foo,bar,v$(<pkg>_VERSION)) I.e in one case we consider the version to be v0.3, in the other case we consider 0.3 to be the version. The problem with v0.3 is that when used in conjunction with release-monitoring.org, it doesn't work very well, because release-monitoring.org has the concept of "version prefix" and using that they drop the "v" prefix for the version. Therefore, a number of packages in Buildroot have a version that doesn't match with release-monitoring.org because Buildroot has 'v0.3' and release-monitoring.org has '0.3'. Since really the version number of 0.3, is makes sense to update our packages to drop this 'v'. This commit only addresses the (common) case of github packages where the prefix is simply 'v'. Other cases will be handled by separate commits. Also, there are a few cases that couldn't be handled mechanically that aren't covered by this commit. Signed-off-by: Victor Huesca <victor.huesca@bootlin.com> [Arnout: don't change flatbuffers, json-for-modern-cpp, libpagekite, python-scapy3k, softether] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-12 08:42:06 +02:00
HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION))
boot, package: use SPDX short identifier for BSD-3c We want to use SPDX identifier for license string as much as possible. SPDX short identifier for BSD-3c is BSD-3-Clause. This change is done using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-3c/BSD-3-Clause/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-30 15:43:38 +02:00
HIREDIS_LICENSE = BSD-3-Clause
hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
HIREDIS_LICENSE_FILES = COPYING
HIREDIS_INSTALL_STAGING = YES
HIREDIS_MAKE_OPTS = \
$(TARGET_CONFIGURE_OPTS) \
PREFIX=/usr
HIREDIS_TARGETS = hiredis.pc
ifeq ($(BR2_STATIC_LIBS),y)
HIREDIS_TARGETS += static
else ifeq ($(BR2_SHARED_LIBS),y)
HIREDIS_TARGETS += dynamic
package/hiredis: fix makefile code Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-14 21:21:31 +01:00
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
HIREDIS_TARGETS += dynamic static
endif
define HIREDIS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(HIREDIS_MAKE_OPTS) -C $(@D) \
$(HIREDIS_TARGETS)
endef
HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis
package/hiredis: fix install step for static build only The previous patch [1] didn't take into acount the static build only scenario. It tries to unconditionally install a shared library. Handle the install step like for bzip2 package: install the shared library only if BR2_SHARED_LIBS or BR2_SHARED_STATIC_LIBS is set and install the static library only if BR2_STATIC_LIBS or BR2_SHARED_STATIC_LIBS is set. [1] 96daacb720cffe1f83259462bef9d3da92925cd9 Fixes: http://autobuild.buildroot.net/results/6be/6be8024dd664af83fcf49ede29c8ad59a37f73d1 Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-14 15:02:25 +02:00
ifeq ($(BR2_SHARED_LIBS),)
define HIREDIS_INSTALL_STAGING_STATIC_LIB
$(INSTALL) -D -m 0755 $(@D)/libhiredis.a \
$(STAGING_DIR)/usr/lib/libhiredis.a
endef
endif
ifeq ($(BR2_STATIC_LIBS),)
define HIREDIS_INSTALL_STAGING_SHARED_LIB
$(INSTALL) -D -m 0755 $(@D)/libhiredis.so \
$(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(STAGING_DIR)/usr/lib/libhiredis.so
endef
define HIREDIS_INSTALL_TARGET_SHARED_LIB
$(INSTALL) -D -m 0755 $(@D)/libhiredis.so \
$(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
ln -sf libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(TARGET_DIR)/usr/lib/libhiredis.so
endef
endif
hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
# Do not call make install as this target will build shared and static libraries
define HIREDIS_INSTALL_STAGING_CMDS
mkdir -p $(HIREDIS_INCLUDE_DIR)
cp -dpfr $(@D)/hiredis.h $(@D)/async.h $(@D)/read.h $(@D)/sds.h \
package/hiredis: install alloc.h This will fix build of collectd, proftpd ... with latest hiredis Fixes: - http://autobuild.buildroot.org/results/f5afe60defd63461a5fc06b26bd4759fb5f56a8f - http://autobuild.buildroot.org/results/45e980c85d170827d3a41e7443cf1088b2d59ead Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-03-29 10:36:50 +02:00
$(@D)/alloc.h $(@D)/adapters $(HIREDIS_INCLUDE_DIR)
hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
$(INSTALL) -D -m 0644 $(@D)/hiredis.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc
package/hiredis: fix install step for static build only The previous patch [1] didn't take into acount the static build only scenario. It tries to unconditionally install a shared library. Handle the install step like for bzip2 package: install the shared library only if BR2_SHARED_LIBS or BR2_SHARED_STATIC_LIBS is set and install the static library only if BR2_STATIC_LIBS or BR2_SHARED_STATIC_LIBS is set. [1] 96daacb720cffe1f83259462bef9d3da92925cd9 Fixes: http://autobuild.buildroot.net/results/6be/6be8024dd664af83fcf49ede29c8ad59a37f73d1 Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-14 15:02:25 +02:00
$(HIREDIS_INSTALL_STAGING_STATIC_LIB)
$(HIREDIS_INSTALL_STAGING_SHARED_LIB)
hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
endef
define HIREDIS_INSTALL_TARGET_CMDS
package/hiredis: fix install step for static build only The previous patch [1] didn't take into acount the static build only scenario. It tries to unconditionally install a shared library. Handle the install step like for bzip2 package: install the shared library only if BR2_SHARED_LIBS or BR2_SHARED_STATIC_LIBS is set and install the static library only if BR2_STATIC_LIBS or BR2_SHARED_STATIC_LIBS is set. [1] 96daacb720cffe1f83259462bef9d3da92925cd9 Fixes: http://autobuild.buildroot.net/results/6be/6be8024dd664af83fcf49ede29c8ad59a37f73d1 Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-14 15:02:25 +02:00
$(HIREDIS_INSTALL_TARGET_SHARED_LIB)
hiredis: new package Minimalistic C client for Redis >= 1.2 It is minimalistic because it just adds minimal support for the protocol, but at the same time it uses a high level printf-alike API in order to make it much higher level than otherwise suggested by its minimal code base and the lack of explicit bindings for every Redis command. https://github.com/redis/hiredis [Peter: use install -t / -D, fix arguments] Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com> Reviewed-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-01-28 21:24:05 +01:00
endef
$(eval $(generic-package))
Reference in New Issue Copy Permalink