NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b719de9d3c
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: fix installation logic of library While testing minetest with libhiredis library, the game crached due to missing libhiredis.so.0.13 library. The hiredis.mk doesn't use "make install" because "make install" depends on building both the shared and static libraries, which fails in static-only scenarios. However, the installation logic in hiredis.mk is bogus: it installs the library as libhiredis.so, while its SONAME is libhiredis.so.0.13. We fix this by using the same logic as the one done by the package "make install" process: install the library as libhiredis.so.0.13, and create libhiredis.so as a symbolic link to it. While at it: - Install the library 0755, this is more common. - Do not create $(TARGET_DIR)/usr/lib, since $(INSTALL) -D will create the necessary directories for the destination path. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> [Thomas: rework to use the same installation logic as the one from hiredis "make install".] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-12 00:26:30 +02:00
HIREDIS_VERSION_MAJOR = 0.13
HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).3
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_SITE = $(call github,redis,hiredis,$(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 \
$(@D)/adapters $(HIREDIS_INCLUDE_DIR)
$(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