rpms/busybox/devel uClibc-0.9.30.1-getline.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 busybox.spec, 1.94, 1.95 sources, 1.28, 1.29 uClibc.config, 1.1, 1.2 uClibc-0.9.30.patch, 1.1, NONE

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27469/devel

Modified Files:
	.cvsignore busybox.spec sources uClibc.config 
Added Files:
	uClibc-0.9.30.1-getline.patch 
Removed Files:
	uClibc-0.9.30.patch 
Log Message:
- Fixing FTBFS on i586/x86_64/ppc, ppc64 still an issue:
- Updated uClibc to 0.9.30.1, subsequently:
- Removed uClibc-0.9.30 patch (merged upstream).
- Added uClibc-0.9.30.1-getline.patch -- prevents conflicts with getline()
  from stdio.h
- Temporarily disable C99 math to bypass ppc bug, see https://bugs.uclibc.org/show_bug.cgi?id=55



uClibc-0.9.30.1-getline.patch:

--- NEW FILE uClibc-0.9.30.1-getline.patch ---
--- busybox-1.13.2/uClibc-0.9.30.1/extra/scripts/unifdef.c	2008/12/28 12:06:04	24572
+++ busybox-1.13.2/uClibc-0.9.30.1/extra/scripts/unifdef.c	2009/04/06 06:40:57	25971
@@ -206,7 +206,7 @@
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         get_line(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@
 
 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = get_line();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -526,7 +526,7 @@
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+get_line(void)
 {
 	const char *cp;
 	int cursym;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	9 Feb 2009 12:15:05 -0000	1.28
+++ .cvsignore	24 May 2009 01:32:19 -0000	1.29
@@ -1,2 +1,2 @@
 busybox-1.13.2.tar.bz2
-uClibc-0.9.30.tar.bz2
+uClibc-0.9.30.1.tar.bz2


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- busybox.spec	24 Feb 2009 06:05:46 -0000	1.94
+++ busybox.spec	24 May 2009 01:32:19 -0000	1.95
@@ -1,13 +1,13 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.13.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
 Source1: busybox-petitboot.config
-Source2: http://www.uclibc.org/downloads/uClibc-0.9.30.tar.bz2
+Source2: http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2
 Source3: uClibc.config
 Patch0: busybox-1.12.1-static.patch
 Patch1: busybox-1.12.1-anaconda.patch
@@ -15,13 +15,16 @@ Patch12: busybox-1.2.2-ls.patch
 Patch14: busybox-1.9.0-msh.patch
 Patch16: busybox-1.10.1-hwclock.patch
 Patch20: busybox-1.12.1-selinux.patch
-Patch21: uClibc-0.9.30.patch
+# patch to avoid conflicts with getline() from stdio.h, already present in upstream VCS
+Patch22: uClibc-0.9.30.1-getline.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
 BuildRequires: libsepol-devel
 BuildRequires: libselinux-static
 BuildRequires: libsepol-static
+# see https://bugzilla.redhat.com/show_bug.cgi?id=502331
+ExcludeArch: ppc64
 
 %define debug_package %{nil}  
 
@@ -60,16 +63,15 @@ better suited to normal use.
 %patch14 -b .msh -p1
 %patch16 -b .ia64 -p1
 %patch20 -b .sel -p1
-cat %{SOURCE3} >uClibc-0.9.30/.config1
-%patch21 -b .orig -p0
-
+cat %{SOURCE3} >uClibc-0.9.30.1/.config1
+%patch22 -b .getline -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
 # We use uclibc instead of system glibc, uclibc is several times
 # smaller, this is important for static build.
 # Build uclibc first.
-cd uClibc-0.9.30
+cd uClibc-0.9.30.1
 # fixme:
 mkdir kernel-include
 cp -a /usr/include/asm kernel-include
@@ -96,8 +98,8 @@ if test "$arch"; then \
     yes "" | make oldconfig && \
     cat .config && \
     make V=1 \
-        EXTRA_CFLAGS="-isystem uClibc-0.9.30/installed/include" \
-        CFLAGS_busybox="-static -nostartfiles -LuClibc-0.9.30/installed/lib uClibc-0.9.30/installed/lib/crt1.o uClibc-0.9.30/installed/lib/crti.o uClibc-0.9.30/installed/lib/crtn.o"; \
+        EXTRA_CFLAGS="-isystem uClibc-0.9.30.1/installed/include" \
+        CFLAGS_busybox="-static -nostartfiles -LuClibc-0.9.30.1/installed/lib uClibc-0.9.30.1/installed/lib/crt1.o uClibc-0.9.30.1/installed/lib/crti.o uClibc-0.9.30.1/installed/lib/crtn.o"; \
 else \
     cat .config && \
     make V=1 CC="gcc $RPM_OPT_FLAGS"; \
@@ -150,11 +152,19 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/busybox.petitboot
 
 %changelog
+* Sun May 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1:1.13.2-4
+- Fixing FTBFS on i586/x86_64/ppc, ppc64 still an issue:
+- Updated uClibc to 0.9.30.1, subsequently:
+- Removed uClibc-0.9.30 patch (merged upstream).
+- Added uClibc-0.9.30.1-getline.patch -- prevents conflicts with getline()
+  from stdio.h
+- Temporarily disable C99 math to bypass ppc bug, see https://bugs.uclibc.org/show_bug.cgi?id=55
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.13.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Feb  9 2009 Ivana Varekova <varekova at redhat.com> - 1:1.13.2-2
-- use uClibc nstead of glibc for static build - thanks Denys Vlasenko
+- use uClibc instead of glibc for static build - thanks Denys Vlasenko
 
 * Mon Jan 19 2009 Ivana Varekova <varekova at redhat.com> - 1:1.13.2-1
 - update to 1.13.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	9 Feb 2009 12:15:05 -0000	1.28
+++ sources	24 May 2009 01:32:19 -0000	1.29
@@ -1,2 +1,2 @@
 9e2a604d18bef219a5a6bf3acf78b9e1  busybox-1.13.2.tar.bz2
-e5766e2566e0297adebebbcc0aba1f2d  uClibc-0.9.30.tar.bz2
+1a4b84e5536ad8170563ffa88c34679c  uClibc-0.9.30.1.tar.bz2


Index: uClibc.config
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/uClibc.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- uClibc.config	9 Feb 2009 12:15:05 -0000	1.1
+++ uClibc.config	24 May 2009 01:32:19 -0000	1.2
@@ -16,7 +16,7 @@ ARCH_HAS_MMU=y
 ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-DO_C99_MATH=y
+DO_C99_MATH=n
 UCLIBC_HAS_FENV=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y
 KERNEL_HEADERS="./kernel-include"


--- uClibc-0.9.30.patch DELETED ---