Header fixes for <fenv.h> and <sys/sysmacros.h>

3 files changed, 111 insertions, 4 deletions

diff --git a/cygwin-1.7.9-fenv.h.patch b/cygwin-1.7.9-fenv.h.patch
new file mode 100644
index 0000000..3c14e95
--- /dev/null
+++ b/cygwin-1.7.9-fenv.h.patch
@@ -0,0 +1,15 @@
+===================================================================
+RCS file: /cvs/src/src/winsup/cygwin/include/fenv.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- src/winsup/cygwin/include/fenv.h	2010/09/11 06:53:28	1.1
++++ src/winsup/cygwin/include/fenv.h	2011/04/24 11:54:06	1.2
+@@ -9,6 +9,7 @@
+ details. */
+ 
+ #ifndef _FENV_H_
++#define _FENV_H_
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/cygwin-1.7.9-sysmacros.h.patch b/cygwin-1.7.9-sysmacros.h.patch
new file mode 100644
index 0000000..5b3602f
--- /dev/null
+++ b/cygwin-1.7.9-sysmacros.h.patch
@@ -0,0 +1,80 @@
+===================================================================
+RCS file: /cvs/src/src/winsup/cygwin/include/cygwin/types.h,v
+retrieving revision 1.33
+retrieving revision 1.35
+diff -u -r1.33 -r1.35
+--- src/winsup/cygwin/include/cygwin/types.h	2011/03/29 10:32:40	1.33
++++ src/winsup/cygwin/include/cygwin/types.h	2011/04/05 00:53:17	1.35
+@@ -9,15 +9,14 @@
+ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+ details. */
+ 
++#ifndef _CYGWIN_TYPES_H
++#define _CYGWIN_TYPES_H
++
+ #ifdef __cplusplus
+ extern "C"
+ {
+ #endif
+ 
+-#ifndef _CYGWIN_TYPES_H
+-#define _CYGWIN_TYPES_H
+-
+-#include <sys/sysmacros.h>
+ #include <stdint.h>
+ #include <endian.h>
+ 
+@@ -218,8 +217,12 @@
+ /* semaphores types */
+ typedef class semaphore *sem_t;
+ #endif /* __INSIDE_CYGWIN__ */
+-#endif /* _CYGWIN_TYPES_H */
++
++/* this header needs the dev_t typedef */
++#include <sys/sysmacros.h>
+ 
+ #ifdef __cplusplus
+ }
+ #endif
++
++#endif /* _CYGWIN_TYPES_H */
+RCS file: /cvs/src/src/winsup/cygwin/include/sys/sysmacros.h,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- src/winsup/cygwin/include/sys/sysmacros.h	2010/02/26 09:36:21	1.4
++++ src/winsup/cygwin/include/sys/sysmacros.h	2011/04/05 00:53:17	1.5
+@@ -11,8 +11,30 @@
+ #ifndef _SYS_SYSMACROS_H
+ #define _SYS_SYSMACROS_H
+ 
+-#define major(dev) ((int)(((dev) >> 16) & 0xffff))
+-#define minor(dev) ((int)((dev) & 0xffff))
+-#define makedev(major, minor) (((major) << 16) | ((minor) & 0xffff))
++_ELIDABLE_INLINE int gnu_dev_major(dev_t);
++_ELIDABLE_INLINE int gnu_dev_minor(dev_t);
++_ELIDABLE_INLINE dev_t gnu_dev_makedev(int, int);
++
++_ELIDABLE_INLINE int
++gnu_dev_major(dev_t dev)
++{
++	return (int)(((dev) >> 16) & 0xffff);
++}
++
++_ELIDABLE_INLINE int
++gnu_dev_minor(dev_t dev)
++{
++	return (int)((dev) & 0xffff);
++}
++
++_ELIDABLE_INLINE dev_t
++gnu_dev_makedev(int maj, int min)
++{
++	return (((maj) << 16) | ((min) & 0xffff));
++}
++
++#define major(dev) gnu_dev_major(dev)
++#define minor(dev) gnu_dev_minor(dev)
++#define makedev(maj, min) gnu_dev_makedev(maj, min)
+ 
+ #endif /* _SYS_SYSMACROS_H */
diff --git a/cygwin.spec b/cygwin.spec
index e3ee844..7fb6a45 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -6,16 +6,19 @@
 
 Name:           cygwin
 Version:        1.7.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cygwin cross-compiler runtime
 
 License:        GPLv2 with exceptions
 Group:          Development/Libraries
 URL:            http://www.cygwin.com/
-Source0:        ftp://sourceware.org/pub/cygwin/release/cygwin/cygwin-%{version}-1-src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+Source0:        ftp://sourceware.org/pub/cygwin/release/cygwin/cygwin-%{version}-1-src.tar.bz2
+Patch0:         cygwin-1.7.9-fenv.h.patch
+Patch1:         cygwin-1.7.9-sysmacros.h.patch
+
 BuildRequires:  cygwin-filesystem >= 2
 BuildRequires:  cygwin-binutils
 BuildRequires:  cygwin-gcc
@@ -32,8 +35,10 @@ Cygwin cross-compiler runtime, base libraries.
 
 %prep
 %setup -q -n cygwin-%{version}-1
+%patch0 -p1
+%patch1 -p1
 
-# code still has some warnings with gcc4.5
+# code still has some warnings with gcc4.5 (remove for 1.7.10)
 sed -i -e 's| -Werror | |' winsup/cygwin/Makefile.in
 
 
@@ -57,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 pushd build
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# 
+# remove files not needed for cross-compiling
 rm -fr $RPM_BUILD_ROOT%{_prefix}/etc
 rm -fr $RPM_BUILD_ROOT%{_bindir}/cygserver-config
 rm -fr $RPM_BUILD_ROOT%{_sbindir}
@@ -91,11 +96,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 28 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.9-2
+- Header fixes for <fenv.h> and <sys/sysmacros.h>.
+
 * Tue Mar 29 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.9-1
 - Version bump.
+- New API: strchrnul.
+- New header: <sys/xattr.h>
 
 * Tue Mar 01 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.8-1
 - Version bump.
+- New APIs: <fenv.h>, C99 complex math functions, POSIX-compliant strerror_r,
+  madvise, pthread_yield, program_invocation_name, program_invocation_short_name.
 
 * Wed Feb 16 2011 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.7-1
 - Initial RPM release, largely based on earlier work from several sources.