Revision: 48595
Author: river
Date: 2009-03-19 19:10:18 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
TSlibmcrypt: convert to new build system
Modified Paths:
--------------
trunk/tools/ts-specs/TSlibmcrypt.spec
trunk/tools/ts-specs/base-specs/libmcrypt.spec
Modified: trunk/tools/ts-specs/TSlibmcrypt.spec
===================================================================
--- trunk/tools/ts-specs/TSlibmcrypt.spec 2009-03-19 19:08:58 UTC (rev
48594)
+++ trunk/tools/ts-specs/TSlibmcrypt.spec 2009-03-19 19:10:18 UTC (rev
48595)
@@ -1,8 +1,3 @@
-#
-# spec file for package TSlibmcrypt
-#
-# includes module(s): libmcrypt
-
%include Solaris.inc
%include arch64.inc
@@ -18,6 +13,7 @@
BuildRequires: TSautomake
BuildRequires: TSautoconf
+BuildRequires: TSlibtool
%include default-depend.inc
@@ -38,25 +34,11 @@
%libmcrypt.prep -d %name-%version/%{base_arch}
%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-export CC="cc"
-export CXX="CC"
-export CPPFLAGS="-I/usr/sfw/include"
-export MSGFMT="/usr/bin/msgfmt"
-
%include arch64.inc
-export CFLAGS="%optflags -m64 -I/usr/sfw/include -DANSICPP
-L/usr/sfw/lib/%_arch64"
-export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="-m64 -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64"
+%include stdenv.inc
%libmcrypt64.build -d %name-%version/%_arch64
%include base.inc
-export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -L/usr/sfw/lib"
-export RPM_OPT_FLAGS="$CFLAGS"
+%include stdenv.inc
%libmcrypt.build -d %name-%version/%{base_arch}
%install
@@ -78,32 +60,16 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_libdir}
+%defattr (-, root, root)
%{_libdir}/lib*.so*
-%dir %attr (0755, root, bin) %{_libdir}/libmcrypt
%{_libdir}/libmcrypt/*.so
-%dir %attr (0755, root, bin) %{_libdir}/%_arch64/libmcrypt
%{_libdir}/%_arch64/libmcrypt/*.so
-%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr (0755, root, bin) %{_libdir}/%_arch64
%{_libdir}/%_arch64/lib*.so*
%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
+%defattr (-, root, root)
%{_bindir}/libmcrypt-config
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, other) %{_datadir}/aclocal
-%{_datadir}/aclocal/*
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/man3
-%{_mandir}/man3/*
-%{_bindir}/%_arch64/libmcrypt-config
-
-%changelog
-* Sun Oct 5 2008 - [email protected]
-- initial spec
+%{_bindir}/%_arch64
+%{_includedir}
+%{_datadir}/aclocal
+%{_mandir}/man3
Modified: trunk/tools/ts-specs/base-specs/libmcrypt.spec
===================================================================
--- trunk/tools/ts-specs/base-specs/libmcrypt.spec 2009-03-19 19:08:58 UTC
(rev 48594)
+++ trunk/tools/ts-specs/base-specs/libmcrypt.spec 2009-03-19 19:10:18 UTC
(rev 48595)
@@ -19,7 +19,7 @@
%build
-PATH=/opt/ts/bin:$PATH
+%include stdenv.inc
rm -rf libltdl
libtoolize --ltdl
@@ -27,23 +27,15 @@
automake
autoconf
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --includedir=%{_includedir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --enable-rpath \
- --enable-dynamic-loading \
- %{?configure_options}
+%_configure --enable-rpath \
+ --enable-dynamic-loading
-gmake -j$CPUS all
+%_make all
%install
-gmake DESTDIR=${RPM_BUILD_ROOT} install
+%include stdenv.inc
+%_make DESTDIR=${RPM_BUILD_ROOT} install
+
%clean
rm -rf $RPM_BUILD_ROOT
-
-%changelog
-* Sun Oct 5 2008 - [email protected]
-- initial release
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
