- build different versions for i[356]86

- opt patch - don't force -march=i386 on x86 (let optflags work)

Changed files:
    dietlibc-opt.patch -> 1.1
    dietlibc.spec -> 1.22

diff --git a/dietlibc-opt.patch b/dietlibc-opt.patch
new file mode 100644 (file)
index 0000000..6892e1f
--- /dev/null
+++ b/dietlibc-opt.patch
@@ -0,0 +1,15 @@
+--- dietlibc-0.20/findcflags.sh.orig   Wed Jul  3 16:07:58 2002
++++ dietlibc-0.20/findcflags.sh        Sun Aug 25 01:12:32 2002
+@@ -1,8 +1,8 @@
+ #!/bin/sh
+ version=`${1:-gcc} -v 2>&1 |grep version|sed 's/gcc version //'`
+ case $version in
+-  2.9*) echo -march=i386 -Os -fomit-frame-pointer -malign-functions=0 -malign-jumps=0 -malign-loops=0 -mpreferred-stack-boundary=2 ;;
+-  3.0*) echo -march=i386 -Os -fomit-frame-pointer -malign-functions=0 -malign-jumps=0 -malign-loops=0 -mpreferred-stack-boundary=2 ;;
+-  3*) echo -Os -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -falign-loops=0 -mpreferred-stack-boundary=2;;
+-  *) echo -O2 -pipe -fomit-frame-pointer ;;
++  2.9*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -malign-functions=0 -malign-jumps=0 -malign-loops=0 -mpreferred-stack-boundary=2 ;;
++  3.0*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -malign-functions=0 -malign-jumps=0 -malign-loops=0 -mpreferred-stack-boundary=2 ;;
++  3*) echo ${OPTFLAGS} -Os -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -falign-loops=0 -mpreferred-stack-boundary=2;;
++  *) echo -O2 ${OPTFLAGS} -pipe -fomit-frame-pointer ;;
+ esac

diff --git a/dietlibc.spec b/dietlibc.spec
index 1434010ea6d0bc95404ea0e7a908b82f9aba1329..cecb2d8e2f63898a88958fb879e35076f0939a95 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -9,9 +9,14 @@ License:       GPL v2
 Group:         Development/Libraries
 Source0:       http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-ppc.patch
+Patch1:                %{name}-opt.patch
 URL:           http://www.fefe.de/dietlibc/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                dietprefix      %{_prefix}/%{_target_cpu}-linux-dietlibc
+# for some reason known only to rpm there must be "\\|" not "\|" here
+%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|athlon/i386/')
+
 %description
 Small libc for building embedded applications.
 
@@ -19,8 +24,8 @@ Small libc for building embedded applications.
 Niewielka libc do budowania aplikacji wbudowanych.
 
 %description -l pt_BR
-A diet libc e' uma libc otimizada para criar pequenos binários estaticamente
-linkados para Linux%package devel.
+A diet libc e' uma libc otimizada para criar pequenos binários
+estaticamente linkados para Linux.
 
 %package devel
 Summary:       Development files for dietlibc
@@ -51,14 +56,15 @@ statyczne.
 
 %prep
 %setup -q 
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-%define dietprefix %{_prefix}/%{_arch}-linux-dietlibc
+OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
 %ifarch sparc sparcv9 
 sparc32 \
 %endif
-%{__make} prefix=%{dietprefix} all 
+%{__make} prefix=%{dietprefix} all
 %ifarch %{ix86}
 %{__make} prefix=%{dietprefix} dyn
 %endif
@@ -74,7 +80,7 @@ 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
 
-cat > $RPM_BUILD_ROOT%{_bindir}/%{_arch}-dietlibc-gcc <<EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<EOF
 #!/bin/sh
 exec %{_bindir}/diet gcc "\$@"
 EOF
@@ -88,9 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc TODO README THANKS CAVEAT CHANGES FAQ BUGS AUTHOR
 %dir %{dietprefix}
-%dir %{dietprefix}/lib-%{_arch}
+%dir %{dietprefix}/lib-%{libarch}
 %ifarch %{ix86}
-%attr(755,root,root) %{dietprefix}/lib-%{_arch}/*.so
+%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.so
 %{_sysconfdir}/*
 %endif
 
@@ -98,9 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{dietprefix}/include
-%attr(755,root,root) %{dietprefix}/lib-%{_arch}/*.o
+%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.o
 %{_mandir}/man*/*
 
 %files static
 %defattr(644,root,root,755)
-%{dietprefix}/lib-%{_arch}/*.a
+%{dietprefix}/lib-%{libarch}/*.a