mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] libhiredis: fix pkgconfig file generation
@ 2014-07-20 14:39 Guillaume GOURAT
  0 siblings, 0 replies; only message in thread
From: Guillaume GOURAT @ 2014-07-20 14:39 UTC (permalink / raw)
  To: ptxdist

    libhiredis: fix pkgconfig file generation
    
    Signed-off-by: Guillaume Gourat <guillaume.gourat@nexvision.fr>

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



-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-07-20 14:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-20 14:39 [ptxdist] [PATCH] libhiredis: fix pkgconfig file generation Guillaume GOURAT

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox