-#
# Conditional build:
-%bcond_with ssp # disable stack-smashing protector 'coz dietlibc will not work with it!
-#
+%bcond_without ssp # stack-smashing protector
+%bcond_with dynamic # dynamic lib support
+
+%ifnarch %{ix86} %{x8664} arm
+%undefine with_dynamic
+%endif
+
Summary: C library optimized for size
-Summary(pl.UTF-8): Biblioteka standardowa C zoptymalizowana na rozmiar
-Summary(pt_BR.UTF-8): libc pequena otimizada para tamanho
+Summary(pl.UTF-8): Biblioteka standardowa C zoptymalizowana na rozmiar
+Summary(pt_BR.UTF-8): libc pequena otimizada para tamanho
Name: dietlibc
-Version: 0.30
-Release: 4
+Version: 0.34
+Release: 1
Epoch: 2
License: GPL v2
Group: Development/Libraries
-Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
-# Source0-md5: 2465d652fff6f1fad3da3b98e60e83c9
+Source0: http://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz
+# Source0-md5: 4f04a6f642548cc5be716a6e0de6b631
Patch0: %{name}-ppc.patch
Patch1: %{name}-opt.patch
Patch2: %{name}-platform.patch
-# workaround for http://gcc.gnu.org/PR26374
-Patch3: %{name}-gcc4.patch
-Patch4: %{name}-guard.patch
-Patch5: %{name}-arm.patch
-Patch6: %{name}-diet-m.patch
-Patch7: %{name}-nice.patch
-Patch8: %{name}-nostrip.patch
-Patch9: %{name}-stackgap-instead-of-ssp.patch
-Patch10: %{name}-fflush-null.patch
-Patch11: %{name}-_syscall-no-arch.patch
-Patch12: %{name}-noexecstacks.patch
+Patch3: %{name}-guard.patch
+Patch4: %{name}-arm.patch
+Patch5: %{name}-diet-m.patch
+Patch6: %{name}-nostrip.patch
+Patch7: %{name}-stackgap-instead-of-ssp.patch
+Patch9: %{name}-memalign.patch
+Patch10: %{name}-getsubopt.patch
+Patch11: %{name}-devmacros.patch
+Patch12: %{name}-notify.patch
+Patch13: x32-fixes.patch
+Patch14: %{name}-no-vsyscall.patch
URL: http://www.fefe.de/dietlibc/
+BuildRequires: rpmbuild(macros) >= 1.566
+BuildRequires: sed >= 4.0
%ifarch sparc sparcv9
BuildRequires: sparc32
%endif
%define dietprefix %{_prefix}/lib/dietlibc
# for some reason known only to rpm there must be "\\|" not "\|" here
-%define libarch %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
+%define libarch %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/;s/sparcv.*/sparc/')
%description
-Small libc for building embedded applications.
+The diet libc is a libc that is optimized for small size. It can be
+used to create small statically linked binaries for Linux on alpha,
+arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.
%description -l pl.UTF-8
-Niewielka libc do budowania aplikacji wbudowanych.
+diet libc to biblioteka libc zoptymalizowana pod kątem rozmiaru.
+Może być używana do tworzenia małych, statycznie zlinkowanych
+binariów dla Linuksa na architekturach alpha, arm, hppa, ia64, i386,
+mips, s390, sparc, sparc64, ppc i x86_64.
%description -l pt_BR.UTF-8
A diet libc e' uma libc otimizada para criar pequenos binários
estaticamente linkados para Linux.
+%package libs
+Summary: Shared dietlibc libraries
+Summary(pl.UTF-8): Biblioteki współdzielone dietlibc
+Group: Libraries
+
+%description libs
+This package contains the shared dietlibc libraries.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera biblioteki współdzielone dietlibc.
+
%package devel
Summary: Development files for dietlibc
-Summary(pl.UTF-8): Pliki dla programistów używających dietlibc
-Summary(pt_BR.UTF-8): libc pequena otimizada para tamanho
+Summary(pl.UTF-8): Pliki dla programistów używających dietlibc
+Summary(pt_BR.UTF-8): libc pequena otimizada para tamanho
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
%package static
Summary: Static libraries for dietlibc
-Summary(pl.UTF-8): Biblioteki statyczne dla dietlibc
+Summary(pl.UTF-8): Biblioteki statyczne dla dietlibc
Group: Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%prep
%setup -q
+%undos arm/md5asm.S
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%{!?with_ssp:%patch9 -p1}
+%{!?with_ssp:%patch7 -p1}
+%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+%if "%{cc_version}" < "3.4"
+%{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
+%endif
%build
-export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
+export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing -Wa,--noexecstack"
+CC="%{__cc}"
%ifarch sparc sparcv9
sparc32 \
%endif
-%{__make} all \
+%{__make} -j1 all \
+ MYARCH=%{libarch} \
prefix=%{dietprefix} \
- CC="%{__cc}"
-%ifarch %{ix86}
-%{__make} dyn \
+ CC="${CC#*ccache }"
+
+%if %{with dynamic}
+# 'dyn' target is not SMP safe
+%{__make} -j1 dyn \
+ MYARCH=%{libarch} \
prefix=%{dietprefix} \
- CC="%{__cc}"
+ CC="${CC}"
%endif
%install
sparc32 \
%endif
%{__make} install \
+ MYARCH=%{libarch} \
DESTDIR=$RPM_BUILD_ROOT \
prefix=%{dietprefix}
mv $RPM_BUILD_ROOT%{dietprefix}/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
rm -rf $RPM_BUILD_ROOT%{dietprefix}/{bin,man}
rm -f $RPM_BUILD_ROOT%{_bindir}/diet-dyn
+rm -f $RPM_BUILD_ROOT%{_bindir}/dnsd
-cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<'EOF'
#!/bin/sh
-exec %{_bindir}/diet gcc "\$@"
+exec %{_bindir}/diet gcc "$@"
EOF
-rm -rf $RPM_BUILD_ROOT%{dietprefix}/include/{asm,linux}
-
%clean
rm -rf $RPM_BUILD_ROOT
%doc AUTHOR BUGS CAVEAT CHANGES FAQ README THANKS TODO
%dir %{dietprefix}
%dir %{dietprefix}/lib-%{libarch}
-%ifarch %{ix86}
+
+%if %{with dynamic}
+%files libs
+%defattr(644,root,root,755)
%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.so
-%{_sysconfdir}/*
+%{_sysconfdir}/diet.ld.conf
%endif
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/*-dietlibc-gcc
+%attr(755,root,root) %{_bindir}/diet
+%attr(755,root,root) %{_bindir}/elftrunc
+%{dietprefix}/lib-%{libarch}/*.o
%{dietprefix}/include
-%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.o
-%{_mandir}/man*/*
+%{_mandir}/man1/diet.1*
%files static
%defattr(644,root,root,755)
projects / packages / dietlibc.git / blobdiff