Author: glen                         Date: Fri Nov  5 08:52:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't need depot_tools at build time to regen makefiles

---- Files affected:
packages/apache-mod_pagespeed:
   apache-mod_pagespeed.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/apache-mod_pagespeed/apache-mod_pagespeed.spec
diff -u packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.4 
packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.5
--- packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.4 Fri Nov  5 
07:22:41 2010
+++ packages/apache-mod_pagespeed/apache-mod_pagespeed.spec     Fri Nov  5 
09:52:27 2010
@@ -36,14 +36,13 @@
 Release:       0.1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
-Source10:      http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
-# Source10-md5:        56a3c406fcb645eaaa608a257f06a90d
+# wget -c http://src.chromium.org/svn/trunk/tools/depot_tools.tar.gz
 # test -d depot_tools || tar xzf depot_tools.tar.gz
 # install -d modpagespeed
 # cd modpagespeed
 # test -f .gclient || ../depot_tools/gclient config 
http://modpagespeed.googlecode.com/svn/trunk/src
 # ../depot_tools/gclient sync
-# Populate the LASTCHANGE file template as we no longer have the VCS files at 
this point
+# Populate the LASTCHANGE file template as we will not include VCS info in 
tarball
 # (cd src/build && svnversion > LASTCHANGE.in)
 # cd ..
 # tar -cjf modpagespeed-$(date +%Y%m%d).tar.bz2 --exclude-vcs modpagespeed
@@ -69,7 +68,7 @@
 site is maintained.
 
 %prep
-%setup -q -n modpagespeed -a10
+%setup -q -n modpagespeed
 
 cat > apache.conf <<EOF
 LoadModule %{mod_name}_module  modules/mod_%{mod_name}.so > apache.conf
@@ -78,10 +77,14 @@
 EOF
 
 %build
-export PATH=$PATH:$(pwd)/depot_tools
 # re-gen makefiles
-gclient runhooks
+cd src
+CC="%{__cc}" \
+CXX="%{__cxx}" \
+%{__python} build/gyp_chromium --format=make build/all.gyp
+cd ..
 
+# makefile wrapper so we could just invoke "make" from shell
 cat > Makefile <<'EOF'
 default:
        $(MAKE) -C src \
@@ -125,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/11/05 08:52:27  glen
+- don't need depot_tools at build time to regen makefiles
+
 Revision 1.4  2010/11/05 06:22:41  glen
 - regenerate makefiles to avoid my paths from tarball
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_pagespeed/apache-mod_pagespeed.spec?r1=1.4&r2=1.5&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to