r48168 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r48167‎ | r48168 | r48169 >
Date:17:28, 8 March 2009
Author:river
Status:deferred
Tags:
Comment:
TSlibedit: new spec
TScheckzfs: make it actually work
Modified paths:
  • /trunk/tools/ts-specs/TSlibedit.spec (added) (history)
  • /trunk/tools/ts-specs/base-specs/libedit.spec (added) (history)
  • /trunk/tools/ts-specs/ext-sources/checkzfs.sh (modified) (history)

Diff [purge]

Index: trunk/tools/ts-specs/ext-sources/checkzfs.sh
@@ -4,6 +4,7 @@
55 VARDIR=/var/opt/ts/checkzfs
66
77 ZFS=/sbin/zfs
 8+ZPOOL=/sbin/zpool
89 STATUSFILE=$VARDIR/curr
910 NEWSTATUS=$VARDIR/new
1011 MAILFILE=$VARDIR/mail
@@ -17,8 +18,8 @@
1819
1920 rm -f $NEWSTATUS
2021
21 -if ! $ZFS status >>$NEWSTATUS; then
22 - echo >&2 "$0: $ZFS status failed; see above messages for details"
 22+if ! $ZPOOL status >>$NEWSTATUS; then
 23+ echo >&2 "$0: $ZPOOL status failed; see above messages for details"
2324 exit 1
2425 fi
2526
Index: trunk/tools/ts-specs/base-specs/libedit.spec
@@ -0,0 +1,31 @@
 2+Name: TSedit
 3+Summary: BSD editline
 4+Version: 20090111-3.0
 5+Source: http://thrysoee.dk/editline/libedit-%{version}.tar.gz
 6+SUNW_BaseDir: %{_basedir}
 7+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 8+
 9+%include default-depend.inc
 10+
 11+%prep
 12+rm -rf %name-%version
 13+%setup -q -n libedit-%version
 14+
 15+%build
 16+
 17+PATH=/opt/ts/bin:$PATH
 18+
 19+./configure --prefix=%{_prefix} \
 20+ --bindir=%{_bindir} \
 21+ --includedir=%{_includedir} \
 22+ --mandir=%{_mandir} \
 23+ --libdir=%{_libdir} \
 24+ --enable-rpath \
 25+
 26+gmake -j$CPUS all
 27+
 28+%install
 29+gmake DESTDIR=${RPM_BUILD_ROOT} install
 30+
 31+%clean
 32+rm -rf $RPM_BUILD_ROOT
Index: trunk/tools/ts-specs/TSlibedit.spec
@@ -0,0 +1,95 @@
 2+%include Solaris.inc
 3+
 4+%include arch64.inc
 5+%use libedit64=libedit.spec
 6+%include base.inc
 7+%use libedit=libedit.spec
 8+
 9+Name: %{libedit.name}
 10+Summary: %{libedit.summary}
 11+Version: %{libedit.version}
 12+SUNW_BaseDir: %{_basedir}
 13+BuildRoot: %{_tmppath}/%{name}-%{version}-build
 14+
 15+%include default-depend.inc
 16+
 17+%package devel
 18+Summary: %{summary} - development files
 19+SUNW_BaseDir: %{_basedir}
 20+%include default-depend.inc
 21+Requires: %name
 22+
 23+%prep
 24+rm -rf %name-%version
 25+mkdir %name-%version
 26+
 27+mkdir %name-%version/%_arch64
 28+%libedit64.prep -d %name-%version/%_arch64
 29+
 30+mkdir %name-%version/%{base_arch}
 31+%libedit.prep -d %name-%version/%{base_arch}
 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+export CC="cc"
 40+export CXX="CC"
 41+export CPPFLAGS="-I/usr/sfw/include"
 42+export MSGFMT="/usr/bin/msgfmt"
 43+
 44+%include arch64.inc
 45+export CFLAGS="%optflags -m64 -I/usr/sfw/include -DANSICPP -L/usr/sfw/lib/%_arch64"
 46+export RPM_OPT_FLAGS="$CFLAGS"
 47+export LDFLAGS="-m64 -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64"
 48+%libedit64.build -d %name-%version/%_arch64
 49+%include base.inc
 50+export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
 51+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -L/usr/sfw/lib"
 52+export RPM_OPT_FLAGS="$CFLAGS"
 53+%libedit.build -d %name-%version/%{base_arch}
 54+
 55+%install
 56+%libedit64.install -d %name-%version/%_arch64
 57+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.la
 58+
 59+%libedit.install -d %name-%version/%{base_arch}
 60+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 61+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 62+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.la
 63+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/*.a
 64+
 65+%clean
 66+rm -rf $RPM_BUILD_ROOT
 67+
 68+%files
 69+%defattr (-, root, bin)
 70+%dir %attr (0755, root, bin) %{_libdir}
 71+%{_libdir}/lib*.so.*
 72+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
 73+%{_libdir}/%_arch64/lib*.so.*
 74+%dir %attr(0755, root, sys) %{_datadir}
 75+%dir %attr(0755, root, bin) %{_mandir}
 76+%dir %attr(0755, root, bin) %{_mandir}/man5
 77+%{_mandir}/man5/*
 78+
 79+%files devel
 80+%defattr (-, root, bin)
 81+%dir %attr (0755, root, bin) %{_includedir}
 82+%{_includedir}/*.h
 83+%dir %attr (0755, root, bin) %{_includedir}/editline
 84+%{_includedir}/editline/*.h
 85+%dir %attr (0755, root, bin) %{_libdir}
 86+%{_libdir}/*.so
 87+%dir %attr (0755, root, bin) %{_libdir}/%_arch64
 88+%{_libdir}/%_arch64/*.so
 89+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
 90+%{_libdir}/pkgconfig/*.pc
 91+%dir %attr (0755, root, other) %{_libdir}/%_arch64/pkgconfig
 92+%{_libdir}/%_arch64/pkgconfig/*.pc
 93+%dir %attr(0755, root, sys) %{_datadir}
 94+%dir %attr(0755, root, bin) %{_mandir}
 95+%dir %attr(0755, root, bin) %{_mandir}/man3
 96+%{_mandir}/man3/*

Status & tagging log