Author: baggins Date: Wed Mar 18 16:46:25 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 2
- removed static_libs bcond
- added dietlibc package (for initrd crypsetup)
---- Files affected:
SPECS:
libgcrypt.spec (1.66 -> 1.67)
---- Diffs:
================================================================
Index: SPECS/libgcrypt.spec
diff -u SPECS/libgcrypt.spec:1.66 SPECS/libgcrypt.spec:1.67
--- SPECS/libgcrypt.spec:1.66 Fri Jan 23 16:15:20 2009
+++ SPECS/libgcrypt.spec Wed Mar 18 17:46:20 2009
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without static_libs # don't build static library
+%bcond_without dietlibc # don't build static dietlibc library
#
Summary: Cryptographic library based on the code from GnuPG
Summary(es.UTF-8): Libgcrypt es una biblioteca general de desarrole
embasada em GnuPG
@@ -9,7 +9,7 @@
Summary(pt_BR.UTF-8): libgcrypt é uma biblioteca de criptografia de uso geral
baseada no GnuPG
Name: libgcrypt
Version: 1.4.4
-Release: 1
+Release: 2
License: LGPL v2.1+
Group: Libraries
# devel versions:
@@ -23,12 +23,17 @@
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.10
BuildRequires: binutils >= 2:2.12
+%{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.31-5}
BuildRequires: gcc >= 5:3.2
BuildRequires: libgpg-error-devel >= 1.4
BuildRequires: libtool >= 1:1.4.3
BuildRequires: texinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# for some reason known only to rpm there must be "\\|" not "\|" here
+%define dietarch %(echo %{_target_cpu} | sed -e
's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
+%define dietlibdir %{_prefix}/lib/dietlibc/lib-%{dietarch}
+
%description
This is a general purpose cryptographic library based on the code from
GnuPG. It provides functions for all cryptograhic building blocks:
@@ -86,6 +91,18 @@
%description static -l pt_BR.UTF-8
Bibliotecas de desenvolvimento para libgcrypt - estático.
+%package dietlibc
+Summary: Static dietlibc libgcrypt library
+Summary(pl.UTF-8): Biblioteka statyczna dietlibc libgcrypt
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description dietlibc
+Static dietlibc libgcrypt library.
+
+%description dietlibc -l pl.UTF-8
+Biblioteka statyczna dietlibc libgcrypt.
+
%prep
%setup -q
%patch0 -p1
@@ -98,14 +115,30 @@
%{__aclocal} -I m4
%{__autoconf}
%{__automake}
+
+%if %{with dietlibc}
%configure \
+ CC="diet %{__cc} -Os %{rpmldflags}" \
--enable-static \
- %{!?with_static_libs:--disable-static}
+ --disable-shared
+
+# libtool sucks, build just the libs
+%{__make} -C cipher
+%{__make} -C mpi
+%{__make} -C random
+%{__make} -C src
+mv src/.libs/libgcrypt.a diet-libgcrypt.a
+%{__make} clean
+%endif
+
+%configure \
+ --enable-static
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+%{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
@@ -116,6 +149,8 @@
ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libgcrypt.so.*.*.*) \
$RPM_BUILD_ROOT%{_libdir}/libgcrypt.so
+%{?with_dietlibc:install diet-libgcrypt.a
$RPM_BUILD_ROOT%{dietlibdir}/libgcrypt.a}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -145,10 +180,14 @@
%{_includedir}/gcrypt*.h
%{_aclocaldir}/libgcrypt.m4
-%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libgcrypt.a
+
+%if %{with dietlibc}
+%files dietlibc
+%defattr(644,root,root,755)
+%{dietlibdir}/libgcrypt.a
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -157,6 +196,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.67 2009/03/18 16:46:20 baggins
+- rel 2
+- removed static_libs bcond
+- added dietlibc package (for initrd crypsetup)
+
Revision 1.66 2009/01/23 15:15:20 adamg
- updated to 1.4.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libgcrypt.spec?r1=1.66&r2=1.67&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
