From: Romain Naour <romain.naour@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/hiredis: fix install step for static build only
Date: Fri, 14 Apr 2017 15:02:25 +0200 [thread overview]
Message-ID: <20170414130225.16408-1-romain.naour@gmail.com> (raw)
The previous patch [1] didn't take into acount the static build only
scenario. It try to install unconditionally 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>
---
package/hiredis/hiredis.mk | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk
index c2be936..dd75742 100644
--- a/package/hiredis/hiredis.mk
+++ b/package/hiredis/hiredis.mk
@@ -31,6 +31,26 @@ endef
HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis
+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
+
# Do not call make install as this target will build shared and static libraries
define HIREDIS_INSTALL_STAGING_CMDS
mkdir -p $(HIREDIS_INCLUDE_DIR)
@@ -38,15 +58,12 @@ define HIREDIS_INSTALL_STAGING_CMDS
$(@D)/adapters $(HIREDIS_INCLUDE_DIR)
$(INSTALL) -D -m 0644 $(@D)/hiredis.pc \
$(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc
- $(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
+ $(HIREDIS_INSTALL_STAGING_STATIC_LIB)
+ $(HIREDIS_INSTALL_STAGING_SHARED_LIB)
endef
define HIREDIS_INSTALL_TARGET_CMDS
- $(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
+ $(HIREDIS_INSTALL_TARGET_SHARED_LIB)
endef
$(eval $(generic-package))
--
2.9.3
next reply other threads:[~2017-04-14 13:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-14 13:02 Romain Naour [this message]
2017-04-14 20:30 ` [Buildroot] [PATCH] package/hiredis: fix install step for static build only Thomas Petazzoni
2017-04-24 19:29 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170414130225.16408-1-romain.naour@gmail.com \
--to=romain.naour@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.