rpms/dietlibc/devel sources,1.5,1.6 dietlibc.spec,1.20,1.21
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sun Jul 9 14:18:32 UTC 2006
Author: ensc
Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14805/devel
Modified Files:
sources dietlibc.spec
Log Message:
- updated to 0.30
- removed cross-arch support
- disable (non-working) SSP support; enable old stackgap code instead of
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 26 May 2005 05:19:25 -0000 1.5
+++ sources 9 Jul 2006 14:18:32 -0000 1.6
@@ -1,2 +1,2 @@
-16d31dd7b5f9124e8ea8280c3f646e13 dietlibc-0.29.tar.bz2
-fc74df6ff5983f15b97a5242bd40fed6 dietlibc-0.29.tar.bz2.sig
+2465d652fff6f1fad3da3b98e60e83c9 dietlibc-0.30.tar.bz2
+698d7624167aad89acfef504da0161ad dietlibc-0.30.tar.bz2.sig
Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- dietlibc.spec 20 Feb 2006 17:41:36 -0000 1.20
+++ dietlibc.spec 9 Jul 2006 14:18:32 -0000 1.21
@@ -1,21 +1,18 @@
## $Id$
## This package understands the following switches:
-## --with cross ... enable crossbuild
-## --define 'crossarch <arch>' ... set cross-architecture (only valid with
-## '--with cross'; defaults to 'arm-linux')
## Fedora Extras specific customization below...
-%global crossarch %{!?crossarch:arm-linux}%{?crossarch}
##
-%global NAME dietlibc
-%global do_crossbuild %{?_with_cross:1}%{!?_with_cross:0}
-
%ifarch %ix86 x86_64 arm
-%global noncross_do_dyn 1
+%global do_dyn 1
%else
-%global noncross_do_dyn 0
+%global do_dyn 0
+%endif
+
+%if %do_dyn
+%global with_dyn 1
%endif
%ifarch %ix86
@@ -24,35 +21,24 @@
%global target_cpu %_target_cpu
%endif
-%global target_cpu %(test "%do_crossbuild" = 1 && echo %crossarch | sed -e 's!-.*!!' || echo %target_cpu)
-%global do_dyn %(test "%do_crossbuild" = 1 && case "%target_cpu" in (x86_86|arm|i?86) echo 1;; (*) echo 0;; esac || echo %noncross_do_dyn)
-%if %do_dyn
-%global with_dyn 1
-%endif
-
%{!?release_func:%global release_func() %1%{?dist}}
Summary: Small libc implementation
-Name: %{?_with_cross:cross-%crossarch-}%NAME
-Version: 0.29
-Release: %release_func 6
+Name: dietlibc
+Version: 0.30
+Release: %release_func 1
License: GPL
Group: Development/Libraries
URL: http://www.fefe.de/dietlibc/
-Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%NAME-%version.tar.bz2
-Source1: http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
+Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2
+Source1: http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig
Patch1: dietlibc-0.28-setpriority.patch
Patch10: dietlibc-0.29-scall.patch
Patch20: dietlibc-0.29-nostackprotector.patch
BuildRoot: %_tmppath/%name-%version-%release-buildroot
%{?with_dyn:Requires: dietlibc-lib = %version-%release}
-%if %do_crossbuild
-BuildRequires: dietlibc
-Requires: dietlibc = %version-%release
-%endif
-
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182118
ExcludeArch: ppc
@@ -76,40 +62,35 @@
%prep
-%setup -q -n %NAME-%version
+%setup -q
%patch1 -p1 -b .nice
%patch10 -p1 -b .scall
%patch20 -p1 -b .nostackprotector
+sed -i -e 's!strip !: !g' Makefile
+sed -i -e 's!^#define WANT_SSP$!// \0!g;
+ s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h
+
%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -fno-stack-protector -Os
-%global basemakeflags prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: %{!?_with_cross:CFLAGS="$RPM_OPT_FLAGS %fixcflags"}
-%global makeflags %basemakeflags %{?_with_cross:CROSS=%crossarch- ARCH=%target_cpu}
+%global basemakeflags prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc
+%global makeflags %basemakeflags
%build
-%if %do_crossbuild
- mkdir -p bin-%_arch
- diet gcc diet.c -DDIETHOME=\"`pwd`\" -DVERSION=\"X\" -o bin-%_arch/diet
-%endif
-
-%__make %makeflags all %{?with_dyn:dyn} %{?_smp_mflags}
+make %makeflags all %{?_smp_mflags}
+# 'dyn' target is not SMP safe
+%{?with_dyn:make %makeflags dyn}
%install
rm -rf $RPM_BUILD_ROOT
-%__install -d -m755 $RPM_BUILD_ROOT/etc
-%__make %makeflags DESTDIR=$RPM_BUILD_ROOT install
+install -d -m755 $RPM_BUILD_ROOT/etc
+make %makeflags DESTDIR=$RPM_BUILD_ROOT install
-%if !%do_crossbuild
- ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
-%endif
+ln -s lib-%_arch ${RPM_BUILD_ROOT}%_libdir/dietlibc/lib-%_arch-%_vendor
-%if %do_crossbuild
- rm -rf ${RPM_BUILD_ROOT}%_libdir/dietlibc/include \
- ${RPM_BUILD_ROOT}%_mandir
-%endif
%clean
@@ -118,16 +99,11 @@
%files
%defattr(-,root,root,-)
%{?with_dyn:%exclude %_libdir/dietlibc/*/*.so}
-
-%if %do_crossbuild
-%_libdir/dietlibc/lib-*
-%else
%doc AUTHOR BUGS CAVEAT CHANGES COPYING FAQ PORTING README*
%doc SECURITY THANKS TODO
%doc %_mandir/*/*
%_bindir/*
%_libdir/dietlibc
-%endif
%if %do_dyn
%files lib
@@ -138,7 +114,13 @@
%_libdir/dietlibc/lib-%target_cpu/*.so
%endif
+
%changelog
+* Sun Jul 9 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30-1
+- updated to 0.30
+- removed cross-arch support
+- disable (non-working) SSP support; enable old stackgap code instead of
+
* Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.29-6
- added '-Os' to the CFLAGS
- exclude PPC arch due to strange compilation errors
More information about the fedora-extras-commits
mailing list