[packages/libpagespeed] allow setting use_system_xxx via gyp flags
glen
glen at pld-linux.org
Fri Mar 8 01:09:40 CET 2013
commit 3adda3ffd685cdbb3c52402609b463e8f82cf90b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Mar 8 02:06:08 2013 +0200
allow setting use_system_xxx via gyp flags
libpagespeed.spec | 14 ++++++++------
system-libs.patch | 15 +++++++++++++++
2 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/libpagespeed.spec b/libpagespeed.spec
index d886c36..4e231bd 100644
--- a/libpagespeed.spec
+++ b/libpagespeed.spec
@@ -8,7 +8,7 @@
# - gflags
# - giflib
# - gtest
-# - icu
+# - icu 4.6.1
# - libharu
# - libjpeg
# - libpng
@@ -20,13 +20,14 @@
Summary: Page Speed native libraries
Name: libpagespeed
Version: 1.12.16.0
-Release: 0.2
+Release: 0.3
License: Apache v2.0
Group: Libraries
Source0: %{name}-%{version}.tar.xz
-# Source0-md5: 59922b57b304392a9364bb659ffc7d2c
+# Source0-md5: 8558c2b583e5858360846299284eb231
Source1: get-source.sh
Source2: gclient.conf
+Patch0: system-libs.patch
URL: https://code.google.com/p/page-speed/
BuildRequires: libstdc++-devel
BuildRequires: rpmbuild(macros) >= 1.268
@@ -40,6 +41,7 @@ Page Speed rule logic.
%prep
%setup -q
+%patch0 -p1
%build
test %{_specdir}/%{name}.spec -nt Makefile && %{__rm} -f Makefile
@@ -52,10 +54,10 @@ CXX="%{__cxx}" \
build/all.gyp \
-Duse_openssl=1 \
-Duse_system_icu=0 \
- -Duse_system_libjpeg=1 \
- -Duse_system_libpng=1 \
+ -Duse_system_libjpeg=0 \
+ -Duse_system_libpng=0 \
-Duse_system_ssl=1 \
- -Duse_system_zlib=1 \
+ -Duse_system_zlib=0 \
%{nil}
%{__make} -r \
diff --git a/system-libs.patch b/system-libs.patch
new file mode 100644
index 0000000..716663f
--- /dev/null
+++ b/system-libs.patch
@@ -0,0 +1,15 @@
+--- libpagespeed-1.12.16.0/build/common.gypi~ 2013-03-08 01:13:30.000000000 +0200
++++ libpagespeed-1.12.16.0/build/common.gypi 2013-03-08 01:47:35.826551134 +0200
+@@ -25,9 +25,9 @@
+ # (Chromium already has transitive dependencies on these libraries
+ # via gtk). We want to link these libraries into our binaries so
+ # we change the default behavior.
+- 'use_system_libjpeg': 0,
+- 'use_system_libpng': 0,
+- 'use_system_zlib': 0,
++ 'use_system_libjpeg%': 0,
++ 'use_system_libpng%': 0,
++ 'use_system_zlib%': 0,
+
+ # During the transition from third_party/protobuf2 to
+ # third_party/protobuf, we need a single global definition of the
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libpagespeed.git/commitdiff/3adda3ffd685cdbb3c52402609b463e8f82cf90b
More information about the pld-cvs-commit
mailing list