From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from 8.mo3.mail-out.ovh.net ([87.98.172.249]
	helo=mo3.mail-out.ovh.net)
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <guillaume.gourat@nexvision.fr>) id 1X8sHC-0003ol-5B
	for ptxdist@pengutronix.de; Sun, 20 Jul 2014 16:40:05 +0200
Received: from mail92.ha.ovh.net (gw6.ovh.net [213.251.189.206])
	by mo3.mail-out.ovh.net (Postfix) with SMTP id 73D5BFF8C32
	for <ptxdist@pengutronix.de>; Sun, 20 Jul 2014 16:39:45 +0200 (CEST)
From: "Guillaume GOURAT" <guillaume.gourat@nexvision.fr>
Date: Sun, 20 Jul 2014 16:39:36 +0200
Message-ID: <007201cfa428$6e645530$4b2cff90$@gourat@nexvision.fr>
MIME-Version: 1.0
Content-Language: fr
Subject: [ptxdist] [PATCH] libhiredis: fix pkgconfig file generation
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

    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