commit 5eafce757ceff01179e6c70ac600453918ae74d8
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Tue Dec 16 00:03:19 2014 +0200
use system yasm
apache-mod_pagespeed.spec | 6 ++++--
gclient.conf | 9 +++++++++
get-source.sh | 9 +++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/apache-mod_pagespeed.spec b/apache-mod_pagespeed.spec
index f0e286a..618ebc3 100644
--- a/apache-mod_pagespeed.spec
+++ b/apache-mod_pagespeed.spec
@@ -21,11 +21,11 @@ Name: apache-mod_%{mod_name}
# beta: 1.9.32.2-beta
# stable: 1.8.31.5
Version: 1.8.31.5
-Release: 0.7
+Release: 0.10
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: modpagespeed-%{version}.tar.xz
-# Source0-md5: 0ec574731370f3da33fd16f536174050
+# Source0-md5: 9aefd5719a9b7946106b625dc7ecd2aa
Source1: get-source.sh
Source2: gclient.conf
Patch0: system-libs.patch
@@ -44,6 +44,7 @@ BuildRequires: opencv-devel >= 2.3.1
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: python-devel >= 1:2.6
+BuildRequires: yasm
# This version of gyp is new enough that it knows to use make for Linux 3.x
# and FreeBSD, but old enough that 'type': 'settings' works and
# LINKER_SUPPORTS_ICF hasn't been removed yet.
@@ -99,6 +100,7 @@ CXX="%{__cxx}" \
-Duse_system_libpng=1 \
-Duse_system_opencv=1 \
-Duse_system_openssl=1 \
+ -Duse_system_yasm=1 \
-Duse_system_zlib=1 \
-Dsystem_include_path_apr=%{_includedir}/apr \
-Dsystem_include_path_aprutil=%{_includedir}/apr-util \
diff --git a/gclient.conf b/gclient.conf
index a71c6d7..09064af 100644
--- a/gclient.conf
+++ b/gclient.conf
@@ -27,6 +27,11 @@ solutions = [{
# need gyp <= @1175
"src/tools/gyp": None,
+ "src/third_party/openssl": None,
+
+ "src/third_party/libjpeg_turbo/yasm": None,
+ "src/third_party/libjpeg_turbo/yasm/source/patched-yasm": None,
+
# need .gyp file
# "src/third_party/protobuf": None,
@@ -43,6 +48,10 @@ solutions = [{
"src/build/mac": None,
"src/build/win": None,
+ "src/tools/clang": None,
+
+ # need build/ios/mac_build.gypi
+# "src/build/ios": None,
# as we have no tests, just keep checkouts and tarball smaller
# "src/testing": None,
diff --git a/get-source.sh b/get-source.sh
index 7ce1a4d..b5676ab 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -105,6 +105,15 @@ almost_strip_dirs \
third_party/instaweb/ \
third_party/openssl/ \
+# some more unneeded files for build
+rm -r third_party/chromium/src/net
+rm -r third_party/chromium/src/chrome
+rm -r net/instaweb/rewriter/testdata
+
+# build/linux and third_party/chromium/src/build/linux are same dirs, the
latter is not usedc
+#rm -r third_party/chromium/src/build/linux
+#third_party/chromium/src/build/linux
+
# Populate the LASTCHANGE file template as we will not include VCS info in
tarball
./build/lastchange.sh . -o LASTCHANGE.in
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_pagespeed.git/commitdiff/a16986b10ae569ebade10e6ef3967d3663786ec1
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
