[gentoo-commits] gentoo-x86 commit in www-apache/mod_spdy/files: make-snapshot.sh mod_spdy-0.9.3.3-system-zlib.patch mod_spdy-0.9.3.3-execinfo.patch

[Mike Frysinger (vapier)]

vapier      13/05/28 00:21:25

  Added:                make-snapshot.sh mod_spdy-0.9.3.3-system-zlib.patch
                        mod_spdy-0.9.3.3-execinfo.patch
  Log:
  Initial ebuild #412451 by candrews.
  
  (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.1                  www-apache/mod_spdy/files/make-snapshot.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_spdy/files/make-snapshot.sh?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_spdy/files/make-snapshot.sh?rev=1.1&content-type=text/plain

Index: make-snapshot.sh
===================================================================
#!/bin/bash

if [[ $# -gt 1 || $1 == -* ]] ; then
	echo "Usage: $0 [ver]"
	exit 1
fi

set -ex

SPDY_URL_BASE="http://mod-spdy.googlecode.com/svn/tags"

if [[ $# -eq 1 ]] ; then
	PV=$1
else
	svnout=$(svn ls ${SPDY_URL_BASE} | grep -v current | sort -V | tail -1)
	PV=${svnout%/}
fi

PN="mod_spdy"
P="${PN}-${PV}"

: ${TMPDIR:=/tmp}

tmp="${TMPDIR}/${PN}"
rm -rf "${tmp}"
mkdir "${tmp}"
cd "${tmp}"

DEPOT_TOOLS_URL="https://chromium.googlesource.com/chromium/tools/depot_tools.git"
SPDY_URL="http://mod-spdy.googlecode.com/svn/tags/${PV}/src"

git clone --single-branch --depth 1 ${DEPOT_TOOLS_URL}
rm -rf depot_tools/.git
PATH=${PWD}/depot_tools:${PATH}
mkdir ${P}
cd ${P}
gclient config ${SPDY_URL}
gclient sync --force --nohooks --delete_unversioned_trees
cd ..

tar cf - depot_tools ${P} | xz > ${P}.tar.xz

mv ${P}.tar.xz "${TMPDIR}"/
cd /
rm -rf "${tmp}"

du -hb "${TMPDIR}/${P}.tar.xz"



1.1                  www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-system-zlib.patch?rev=1.1&content-type=text/plain

Index: mod_spdy-0.9.3.3-system-zlib.patch
===================================================================
--- src/third_party/zlib/zlib.gyp
+++ src/third_party/zlib/zlib.gyp
@@ -81,14 +81,6 @@
           'defines': [
             'USE_SYSTEM_ZLIB',
           ],
-          'sources': [
-            'contrib/minizip/ioapi.c',
-            'contrib/minizip/ioapi.h',
-            'contrib/minizip/unzip.c',
-            'contrib/minizip/unzip.h',
-            'contrib/minizip/zip.c',
-            'contrib/minizip/zip.h',
-          ],
           'conditions': [
             ['OS=="android"', {
               'toolsets': ['target', 'host'],
@@ -97,6 +89,7 @@
           'link_settings': {
             'libraries': [
               '-lz',
+              '-lminizip',
             ],
           },
         }],

https://code.google.com/p/mod-spdy/issues/detail?id=71

--- src/build/common.gypi
+++ src/build/common.gypi
@@ -25,7 +25,7 @@
     # (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_zlib': 0,
+    'use_system_zlib%': 0,
     'use_system_apache_dev%': 0,
 
     # Putting a variables dict inside another variables dict looks kind of



1.1                  www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/mod_spdy/files/mod_spdy-0.9.3.3-execinfo.patch?rev=1.1&content-type=text/plain

Index: mod_spdy-0.9.3.3-execinfo.patch
===================================================================
not everyone has this header

--- a/src/third_party/chromium/src/base/debug/debugger_posix.cc
+++ b/src/third_party/chromium/src/base/debug/debugger_posix.cc
@@ -17,10 +17,6 @@
 #include <string>
 #include <vector>
 
-#if !defined(OS_ANDROID) && !defined(OS_NACL)
-#include <execinfo.h>
-#endif
-
 #if defined(__GLIBCXX__)
 #include <cxxabi.h>
 #endif
--- a/src/third_party/chromium/src/base/debug/stack_trace_posix.cc
+++ b/src/third_party/chromium/src/base/debug/stack_trace_posix.cc
@@ -5,7 +5,12 @@
 #include "base/debug/stack_trace.h"
 
 #include <errno.h>
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
 #include <execinfo.h>
+#else
+#define backtrace(array, size) 0
+#define backtrace_symbols(array, size) NULL
+#endif
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>