[gnome-continuous] Update the build API patch for Evolution



commit ba4e08bb0e02c9875046d18691e5bab9fe2e6789
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Feb 19 12:01:06 2017 +0000

    Update the build API patch for Evolution
    
    Use the overrides passed to the configure script in the CMake build.

 patches/evolution-buildapi.patch |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/patches/evolution-buildapi.patch b/patches/evolution-buildapi.patch
index 037739b..d781de9 100644
--- a/patches/evolution-buildapi.patch
+++ b/patches/evolution-buildapi.patch
@@ -1,4 +1,4 @@
-From 74cfa1c78d05303c01c011d30f1feeb830c2ec54 Mon Sep 17 00:00:00 2001
+From a2a682b339930221c058859ac7964fd5015c1814 Mon Sep 17 00:00:00 2001
 From: Emmanuele Bassi <ebassi gnome org>
 Date: Fri, 21 Oct 2016 04:13:24 +0530
 Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
@@ -6,20 +6,23 @@ Subject: [PATCH] build: Add a "configure" script implementing the GNOME Build
 
 See http://people.gnome.org/~walters/docs/build-api.txt
 
+v3:
+  - Update the overrides for CMake
+
 v2:
   - Use the Ninja generator for CMake
   - Perform various sanity checks
 ---
- configure | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 101 insertions(+)
+ configure | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 107 insertions(+)
  create mode 100755 configure
 
 diff --git a/configure b/configure
 new file mode 100755
-index 0000000000..f9efc09ecd
+index 0000000..7b8c446
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,107 @@
 +#!/bin/bash
 +# configure script adapter for cmake
 +# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -119,8 +122,14 @@ index 0000000000..f9efc09ecd
 +     -DENABLE_YTNEF=OFF \
 +     -DWITH_OPENLDAP=OFF \
 +     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
++     -DBIN_INSTALL_DIR:PATH=${bindir} \
++     -DINCLUDE_INSTALL_DIR:PATH=${includedir} \
++     -DLIB_INSTALL_DIR:PATH=${libdir} \
++     -DLIBEXEC_INSTALL_DIR:PATH=${libexecdir} \
++     -DSHARE_INSTALL_DIR:PATH=${datadir} \
++     -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
 +     -GNinja \
 +     ${srcdir}
 -- 
-2.11.1
+2.9.3
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]