[packages/libpagespeed] builds with systeb zlib
glen
glen at pld-linux.org
Fri Mar 8 02:09:54 CET 2013
commit ac2639e2072f069c4bc32ceb20c125f8c7f58799
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Mar 8 03:05:41 2013 +0200
builds with systeb zlib
libpagespeed.spec | 8 +++-----
system-libs.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 5 deletions(-)
---
diff --git a/libpagespeed.spec b/libpagespeed.spec
index 4ae83a6..3aa7251 100644
--- a/libpagespeed.spec
+++ b/libpagespeed.spec
@@ -15,12 +15,11 @@
# - libwebp
# - optipng
# - protobuf
-# - zlib
# . ...
Summary: Page Speed native libraries
Name: libpagespeed
Version: 1.12.16.0
-Release: 0.3
+Release: 0.4
License: Apache v2.0
Group: Libraries
Source0: %{name}-%{version}.tar.xz
@@ -54,13 +53,12 @@ CXX="%{__cxx}" \
--format=make \
--depth=. \
build/all.gyp \
- -Duse_openssl=1 \
+ -Duse_openssl=0 \
-Duse_system_icu=0 \
-Duse_system_libjpeg=0 \
-Duse_system_libpng=0 \
-Duse_system_ssl=1 \
- -Duse_system_zlib=0 \
- %{nil}
+ -Duse_system_zlib=1 \
%{__make} -r \
BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \
diff --git a/system-libs.patch b/system-libs.patch
index 716663f..6e7f073 100644
--- a/system-libs.patch
+++ b/system-libs.patch
@@ -13,3 +13,55 @@
# During the transition from third_party/protobuf2 to
# third_party/protobuf, we need a single global definition of the
+--- libpagespeed-1.12.16.0/pagespeed/apps/apps.gyp 2013-03-08 02:52:27.839631948 +0200
++++ libpagespeed-1.12.16.0/pagespeed/apps/apps.gyp 2013-03-08 02:57:48.004425187 +0200
+@@ -74,6 +74,11 @@
+ 'sources': [
+ 'pagespeed.cc',
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-lz',
++ ],
++ },
+ },
+ {
+ 'target_name': 'optimize_image_bin',
+@@ -89,6 +94,11 @@
+ 'sources': [
+ 'optimize_image.cc',
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-lz',
++ ],
++ },
+ },
+ {
+ 'target_name': 'pagespeed_java',
+--- libpagespeed-1.12.16.0/pagespeed/pagespeed.gyp 2013-03-08 03:00:52.752961508 +0200
++++ libpagespeed-1.12.16.0/pagespeed/pagespeed.gyp 2013-03-08 03:02:46.954904884 +0200
+@@ -213,6 +213,11 @@
+ 'defines': [
+ 'RULES_TEST_DIR_PATH="pagespeed/rules/testdata/"',
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-lz',
++ ],
++ },
+ },
+ {
+ 'target_name': 'pagespeed_image_test',
+@@ -246,6 +251,11 @@
+ 'defines': [
+ 'IMAGE_TEST_DIR_PATH="pagespeed/image_compression/testdata/"',
+ ],
++ 'link_settings': {
++ 'libraries': [
++ '-lz',
++ ],
++ },
+ },
+ ],
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libpagespeed.git/commitdiff/f44e6e3d41d47142be1e80a07867de1fb3e161f6
More information about the pld-cvs-commit
mailing list