[gnome-continuous] Update build-api patch for woff2
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Update build-api patch for woff2
- Date: Mon, 4 Dec 2017 23:52:18 +0000 (UTC)
commit 88fa41e84a42d04c9cfe83fabccb671cad8806e9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Dec 4 23:51:58 2017 +0000
Update build-api patch for woff2
patches/woff2-cmake-build-api.patch | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/patches/woff2-cmake-build-api.patch b/patches/woff2-cmake-build-api.patch
index 50290d1..de1f4c0 100644
--- a/patches/woff2-cmake-build-api.patch
+++ b/patches/woff2-cmake-build-api.patch
@@ -1,4 +1,4 @@
-From 818bef2bcb97648f0297aa0184434315334fbea9 Mon Sep 17 00:00:00 2001
+From 21a03d00033850fd410b30be326cebc1092014b6 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi gnome org>
Date: Fri, 21 Nov 2014 11:12:07 +0100
Subject: [PATCH] Add a build API wrapper
@@ -6,17 +6,21 @@ Subject: [PATCH] Add a build API wrapper
Original patch from: Debarshi Ray <debarshir gnome org>
See https://github.com/cgwalters/build-api
+
+v2:
+ - Add includedir
+ - Remove Makefile generation: we can use Ninja
---
- configure | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 90 insertions(+)
+ configure | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 78 insertions(+)
create mode 100755 configure
diff --git a/configure b/configure
new file mode 100755
-index 0000000..adc3562
+index 0000000..ed53b34
--- /dev/null
+++ b/configure
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,78 @@
+#!/bin/bash
+# configure script adapter for cmake
+# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -79,6 +83,7 @@ index 0000000..adc3562
+ --sysconfdir) read_arg sysconfdir "$@" || shift;;
+ --libdir) read_arg libdir "$@" || shift;;
+ --mandir) read_arg mandir "$@" || shift;;
++ --includedir) read_arg includedir "$@" || shift;;
+ *) echo "Ignoring unknown option '$1'";;
+ esac
+ shift
@@ -86,19 +91,6 @@ index 0000000..adc3562
+
+srcdir=$(dirname $0)
+
-+unset CFLAGS
-+unset CXXFLAGS
-+
-+cat > Makefile <<END
-+# Generated by configure; do not edit
-+
-+all:
-+ ${NINJA}
-+
-+install:
-+ DESTDIR="\$(DESTDIR)" ${NINJA} install
-+END
-+
+exec cmake \
+ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+ -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]