r47734 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r47733‎ | r47734 | r47735 >
Date:00:11, 24 February 2009
Author:river
Status:deferred
Tags:
Comment:
TSserf: new spec
TSsubversion: use serf instead of libneon to avoid a neon bug which sends negative content-length
Modified paths:
  • /trunk/tools/ts-specs/TSneon.spec (modified) (history)
  • /trunk/tools/ts-specs/TSserf.spec (added) (history)
  • /trunk/tools/ts-specs/TSsubversion.spec (modified) (history)
  • /trunk/tools/ts-specs/base-specs/apu.spec (modified) (history)
  • /trunk/tools/ts-specs/base-specs/serf.spec (added) (history)
  • /trunk/tools/ts-specs/include/arch64.inc (modified) (history)
  • /trunk/tools/ts-specs/include/base.inc (modified) (history)
  • /trunk/tools/ts-specs/patches/serf-01-cflags.diff (added) (history)
  • /trunk/tools/ts-specs/patches/subversion-01-iconv.diff (added) (history)

Diff [purge]

Index: trunk/tools/ts-specs/include/arch64.inc
——@@ -59,8 +59,8 @@
6060 %endif
6161
6262 %ifarch i386
63 -%define suncc_optflags64 -i %_cc64_opt_level -xstrconst -xarch=generic64 -Kpic -xregs=no%%frameptr
64 -%define suncc_cxx_optflags64 -i %_cxx64_opt_level -xarch=generic64 -Kpic -pentium -mr -norunpath -xregs=no%%frameptr
 63+%define suncc_optflags64 -i %_cc64_opt_level -xstrconst -m64 -Kpic -xregs=no%%frameptr
 64+%define suncc_cxx_optflags64 -i %_cxx64_opt_level -m64 -Kpic -pentium -mr -norunpath -xregs=no%%frameptr
6565 %endif
6666
6767 %if %cc_is_gcc
Index: trunk/tools/ts-specs/include/base.inc
——@@ -11,6 +11,8 @@
1212 %define bld_arch "i386"
1313 %endif
1414
 15+%define opt_arch64 0
 16+
1517 # use --without-gtk-doc to disable building gtk-docs (it takes quite
1618 # a while to build them)
1719 # default: build gtk-doc API docs
Index: trunk/tools/ts-specs/TSsubversion.spec
——@@ -8,14 +8,15 @@
99 Name: TSsubversion
1010 License: Apache,LGPL,BSD
1111 Group: system/dscm
12 -Version: 1.4.6
 12+Version: 1.5.5
1313 Release: 1
1414 Summary: Subversion SCM
1515 Source: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
16 -
 16+Patch1: subversion-01-iconv.diff
1717 URL: http://subversion.tigris.org/
1818 BuildRoot: %{_tmppath}/%{name}-%{version}-build
1919 SUNW_BaseDir: %{_prefix}
 20+
2021 Requires: SUNWcsl
2122 Requires: SUNWcsr
2223 Requires: TSgdbm
——@@ -24,12 +25,14 @@
2526 Requires: SUNWpostrun
2627 Requires: SUNWopenssl-libraries
2728 Requires: SUNWlexpt
28 -Requires: TSneon
 29+Requires: TSserf
 30+Requires: TSlibiconv
2931 BuildRequires: SUNWPython
3032 BuildRequires: SUNWopenssl-include
3133 BuildRequires: TSgdbm-devel
32 -BuildRequires: TSneon-devel
 34+BuildRequires: TSserf-devel
3335 BuildRequires: TSapache
 36+BuildRequires: TSlibiconv-devel
3437
3538 %description
3639 Subversion source code management system.
——@@ -60,6 +63,7 @@
6164
6265 %prep
6366 %setup -q -n subversion-%{version}
 67+%patch1 -p0
6468 #%patch1 -p1 -b .patch01
6569
6670 %build
——@@ -83,7 +87,8 @@
8488 --infodir=%{_infodir} \
8589 --with-apr=/opt/ts \
8690 --with-apr-util=/opt/ts \
87 - --with-neon=%{_prefix} \
 91+ --with-serf=%{_prefix} \
 92+ --with-neon=no \
8893 --with-apxs=/opt/TSapache/bin/apxs
8994
9095 gmake
Index: trunk/tools/ts-specs/TSneon.spec
——@@ -10,7 +10,7 @@
1111 Group: system/dscm
1212 # Be careful not to update this to a newer version without checking
1313 # if subversion will like it.
14 -Version: 0.26.2
 14+Version: 0.28.3
1515 Release: 1
1616 Summary: neon http and webdav client library
1717 Source: http://www.webdav.org/neon/neon-%{version}.tar.gz
——@@ -132,6 +132,8 @@
133133 %endif
134134
135135 %changelog
 136+* Mon Feb 23 2009 - river@loreley.flyingparchment.org.uk
 137+- 2.83.3
136138 * Thu Jun 19 2008 - river@wikimedia.org
137139 - modified for toolserver
138140 * Mon Feb 25 2008 - laca@sun.com
Index: trunk/tools/ts-specs/base-specs/serf.spec
——@@ -0,0 +1,46 @@
 2+Name: TSserf
 3+Summary: Serf HTTP library
 4+Version: 0.3.0
 5+Source: http://serf.googlecode.com/files/serf-%{version}.tar.bz2
 6+Patch1: serf-01-cflags.diff
 7+
 8+%prep
 9+%setup -q -n serf-%{version}
 10+%patch1 -p0
 11+
 12+%if %opt_arch64
 13+%define _libsubdir %_arch64
 14+%else
 15+%define _libsubdir ""
 16+%endif
 17+
 18+export CC=cc
 19+export CXX=CC
 20+export CFLAGS="%optflags"
 21+export CPPFLAGS=-I/usr/sfw/include
 22+export CXXFLAGS="%cxx_optflags"
 23+export LDFLAGS="%_ldflags -L%{_libdir}/%_libsubdir -L/usr/sfw/lib/%_libsubdir -R%{_libdir}/%_libsubdir:/usr/sfw/lib/%_libsubdir"
 24+
 25+./configure \
 26+ --prefix=%{_prefix} \
 27+ --libdir=%{_libdir} \
 28+ --bindir=%{_bindir} \
 29+ --with-apr=$APR_CONFIG \
 30+ --with-apr-util=$APR_UTIL_CONFIG \
 31+ --includedir=$INCDIR \
 32+
 33+%build
 34+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
 35+if test "x$CPUS" = "x" -o $CPUS = 0; then
 36+ CPUS=1
 37+fi
 38+
 39+gmake -j$CPUS
 40+
 41+%install
 42+gmake install DESTDIR=$RPM_BUILD_ROOT
 43+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 44+#rm $RPM_BUILD_ROOT%{_libdir}/*.la
 45+
 46+%clean
 47+rm -rf $RPM_BUILD_ROOT
Index: trunk/tools/ts-specs/base-specs/apu.spec
——@@ -2,7 +2,6 @@
33 Summary: Apache Portable Runtime utility functions
44 Version: 1.3.4
55 Source: http://mirrors.dedipower.com/ftp.apache.org/apr/apr-util-%{version}.tar.gz
6 -Source1: http://mirrors.dedipower.com/ftp.apache.org/apr/apr-iconv-1.2.1.tar.gz
76
87 %prep
98 %setup -q -n apr-util-%{version}
——@@ -22,9 +21,10 @@
2322 --bindir=%{_bindir} \
2423 --with-apr=$APR_CONFIG \
2524 --includedir=$INCDIR \
26 - --with-ldap=ldap \
27 - --with-iconv=/opt/ts
 25+ --with-ldap=ldap
2826
 27+ #--with-iconv=/opt/ts
 28+
2929 %build
3030 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
3131 if test "x$CPUS" = "x" -o $CPUS = 0; then
Index: trunk/tools/ts-specs/patches/serf-01-cflags.diff
——@@ -0,0 +1,31 @@
 2+--- Makefile.in.old Mon Feb 23 23:31:11 2009
 3+@@ -84,22 +84,22 @@
 4+ test/test_ssl.lo: test/test_ssl.c $(HEADERS)
 5+
 6+ $(TARGET_LIB): $(OBJECTS)
 7+- $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $(LIBS)
 8++ $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $(LIBS)
 9+
 10+ test/serf_get: $(TARGET_LIB) test/serf_get.lo
 11+- $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 12++ $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 13+
 14+ test/serf_response: $(TARGET_LIB) test/serf_response.lo
 15+- $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 16++ $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 17+
 18+ test/serf_request: $(TARGET_LIB) test/serf_request.lo
 19+- $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 20++ $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 21+
 22+ test/serf_spider: $(TARGET_LIB) test/serf_spider.lo
 23+- $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 24++ $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 25+
 26+ test/test_all: $(TARGET_LIB) $(TEST_SUITE_OBJECTS)
 27+- $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 28++ $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^ $(LIBS)
 29+
 30+ check: test/serf_response test/test_all
 31+ @for i in $(TESTCASES); \
Index: trunk/tools/ts-specs/patches/subversion-01-iconv.diff
——@@ -0,0 +1,11 @@
 2+--- subversion/include/svn_utf.h.old Mon Feb 23 22:24:11 2009
 3+@@ -35,7 +35,7 @@
 4+
 5+
 6+ #ifndef AS400
 7+-#define SVN_APR_LOCALE_CHARSET APR_LOCALE_CHARSET
 8++#define SVN_APR_LOCALE_CHARSET ""
 9+ #define SVN_APR_DEFAULT_CHARSET APR_DEFAULT_CHARSET
 10+ #else
 11+ /* APR_LOCALE_CHARSET and APR_DEFAULT_CHARSET are defined as ints on
Index: trunk/tools/ts-specs/TSserf.spec
——@@ -0,0 +1,94 @@
 2+%include Solaris.inc
 3+
 4+%ifarch amd64 sparcv9
 5+%include arch64.inc
 6+%use serf_64 = serf.spec
 7+%endif
 8+
 9+%include base.inc
 10+%use serf = serf.spec
 11+
 12+SUNW_BaseDir: %{_basedir}
 13+
 14+Name: %{serf.name}
 15+Summary: %{serf.summary}
 16+Version: %{serf.version}
 17+License: Apache
 18+BuildRoot: %{_tmppath}/serf-%{version}-build
 19+%include default-depend.inc
 20+
 21+%package devel
 22+Summary: %{summary} - development files
 23+SUNW_BaseDir: %{_basedir}
 24+%include default-depend.inc
 25+Requires: %name
 26+
 27+%prep
 28+rm -rf %name-%version
 29+mkdir %name-%version
 30+
 31+%ifarch amd64 sparcv9
 32+export APR_CONFIG=%{_prefix}/bin/%_arch64/apr-1-config
 33+export APR_UTIL_CONFIG=%{_prefix}/bin/%_arch64/apu-1-config
 34+export INCDIR=%{_includedir}/%_arch64
 35+mkdir %name-%version/%_arch64
 36+%serf_64.prep -d %name-%version/%_arch64
 37+%endif
 38+
 39+mkdir %name-%version/%base_arch
 40+export APR_CONFIG=%{_prefix}/bin/apr-1-config
 41+export APR_UTIL_CONFIG=%{_prefix}/bin/apu-1-config
 42+export INCDIR=%{_includedir}/%base_arch
 43+%serf.prep -d %name-%version/%base_arch
 44+
 45+%build
 46+%ifarch amd64 sparcv9
 47+export APR_CONFIG=%{_prefix}/bin/%_arch64/apr-1-config
 48+export APR_UTIL_CONFIG=%{_prefix}/bin/%_arch64/apu-1-config
 49+export INCDIR=%{_includedir}/%_arch64
 50+%serf_64.build -d %name-%version/%_arch64
 51+%endif
 52+
 53+export APR_CONFIG=%{_prefix}/bin/apr-1-config
 54+export APR_UTIL_CONFIG=%{_prefix}/bin/apu-1-config
 55+export INCDIR=%{_includedir}/%base_arch
 56+%serf.build -d %name-%version/%base_arch
 57+
 58+%install
 59+rm -rf $RPM_BUILD_ROOT
 60+
 61+%ifarch amd64 sparcv9
 62+%serf_64.install -d %name-%version/%_arch64
 63+%endif
 64+
 65+%serf.install -d %name-%version/%base_arch
 66+
 67+%clean
 68+rm -rf $RPM_BUILD_ROOT
 69+
 70+%files
 71+%defattr(-,root,bin)
 72+%dir %attr (0755, root, bin) %{_libdir}
 73+%{_libdir}/*.so.*
 74+%ifarch amd64 sparcv9
 75+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
 76+%{_libdir}/%_arch64/*.so.*
 77+%endif
 78+
 79+%files devel
 80+%defattr(-,root,bin)
 81+
 82+%dir %attr (0755, root, bin) %{_includedir}
 83+%{_includedir}/*
 84+%dir %attr (0755, root, bin) %{_libdir}
 85+%{_libdir}/*.so
 86+%{_libdir}/*.la
 87+%ifarch amd64 sparcv9
 88+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
 89+%{_libdir}/%{_arch64}/*.so
 90+%{_libdir}/%{_arch64}/*.la
 91+%endif
 92+
 93+%changelog
 94+* Mon Feb 23 2009 - river@loreley.flyingparchment.org.uk
 95+- initial spec

Status & tagging log