From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 20.mo5.mail-out.ovh.net ([91.121.55.239] helo=mo5.mail-out.ovh.net) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1X9AJU-0005tf-Jx for ptxdist@pengutronix.de; Mon, 21 Jul 2014 11:55:21 +0200 Received: from mail438.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo5.mail-out.ovh.net (Postfix) with SMTP id 17F7EFF9259 for ; Mon, 21 Jul 2014 11:55:20 +0200 (CEST) From: Guillaume Gourat Date: Mon, 21 Jul 2014 11:53:02 +0200 Message-Id: <1405936382-6544-6-git-send-email-guillaume.gourat@nexvision.fr> In-Reply-To: <1405936382-6544-1-git-send-email-guillaume.gourat@nexvision.fr> References: <1405936382-6544-1-git-send-email-guillaume.gourat@nexvision.fr> Subject: [ptxdist] [PATCH 6/6] libhiredis: fix pkgconfig file generation Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 Cc: Guillaume GOURAT From: Guillaume GOURAT Signed-off-by: Guillaume GOURAT --- .../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