From: Guillaume Gourat <guillaume.gourat@nexvision.fr>
To: ptxdist@pengutronix.de
Cc: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
Subject: [ptxdist] [PATCH 6/6] libhiredis: fix pkgconfig file generation
Date: Mon, 21 Jul 2014 11:53:02 +0200 [thread overview]
Message-ID: <1405936382-6544-6-git-send-email-guillaume.gourat@nexvision.fr> (raw)
In-Reply-To: <1405936382-6544-1-git-send-email-guillaume.gourat@nexvision.fr>
From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
.../04_pkgconfig-cmake-mkdir.patch | 26 ++++++++++++++++++++
patches/libhiredis-0.11.0/series | 1 +
2 files changed, 27 insertions(+)
create mode 100644 patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch
diff --git a/patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch b/patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch
new file mode 100644
index 0000000..6263755
--- /dev/null
+++ b/patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch
@@ -0,0 +1,26 @@
+Index: libhiredis-0.11.0/Makefile
+===================================================================
+--- libhiredis-0.11.0.orig/Makefile 2014-07-20 16:07:04.146360911 +0200
++++ libhiredis-0.11.0/Makefile 2014-07-20 16:25:17.036624864 +0200
+@@ -125,10 +125,9 @@
+ INSTALL?= cp -a
+
+ hiredis.pc: hiredis.pc.in
+- test -d $(INSTALL_PKGCONFIG_PATH) && \
+- $(SED) -e 's,@PREFIX@,$(PREFIX),g' \
+- -e 's,@LIB_PREFIX@,$(LIB_PREFIX),g' \
+- -e 's,@CFLAGS@,$(PKG_CONFIG_CFLAGS),g' $< >$@ || true
++ $(SED) -e 's,@PREFIX@,$(PREFIX),g' \
++ -e 's,@LIB_PREFIX@,$(LIB_PREFIX),g' \
++ -e 's,@CFLAGS@,$(PKG_CONFIG_CFLAGS),g' $< >$@ || true
+
+ install: $(DYLIBNAME) $(STLIBNAME) hiredis.pc
+ mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+@@ -137,6 +136,7 @@
+ cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
+ cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+ $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
++ mkdir -p $(INSTALL_PKGCONFIG_PATH) $(INSTALL_CMAKE_MODULES_PATH)
+ test -f hiredis.pc && \
+ test -d $(INSTALL_PKGCONFIG_PATH) && \
+ $(INSTALL) hiredis.pc $(INSTALL_PKGCONFIG_PATH) && \
diff --git a/patches/libhiredis-0.11.0/series b/patches/libhiredis-0.11.0/series
index dd8f003..87dd71a 100644
--- a/patches/libhiredis-0.11.0/series
+++ b/patches/libhiredis-0.11.0/series
@@ -1,2 +1,3 @@
01_use-proper-destdir.patch
03_pkgconfig-cmake.patch
+04_pkgconfig-cmake-mkdir.patch
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-07-21 9:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-21 9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
2014-07-21 9:52 ` [ptxdist] [PATCH 2/6] libevent: version bump 2.0.10 -> 2.0.21 Guillaume Gourat
2014-07-21 9:52 ` [ptxdist] [PATCH 3/6] gflags: add new package Guillaume Gourat
2014-07-21 9:53 ` [ptxdist] [PATCH 4/6] glog: " Guillaume Gourat
2014-09-01 10:31 ` Michael Olbrich
2014-07-21 9:53 ` [ptxdist] [PATCH 5/6] libhiredis: " Guillaume Gourat
2014-09-01 10:49 ` Michael Olbrich
2014-07-21 9:53 ` Guillaume Gourat [this message]
2014-09-01 10:25 ` [ptxdist] [PATCH 1/6] libconfig: " Michael Olbrich
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=1405936382-6544-6-git-send-email-guillaume.gourat@nexvision.fr \
--to=guillaume.gourat@nexvision.fr \
--cc=ptxdist@pengutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox