[rtems-crossrpms commit] Add w32api-headers and w32api-runtime.

Ralf Corsepius ralf at rtems.org
Thu Jan 30 18:03:14 UTC 2014 

Module:    rtems-crossrpms
Branch:    master
Commit:    811f5fb93f035dac64129aae816f4a0c8418c969
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=811f5fb93f035dac64129aae816f4a0c8418c969

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Thu Dec 12 06:59:59 2013 +0100

Add w32api-headers and w32api-runtime.

---

 cygwin/i686/Makefile.am                            |    8 +
 cygwin/i686/Makefile.in                            |   52 ++++++-
 cygwin/i686/i686-pc-cygwin-w32api-headers.spec     |  153 ++++++++++++++++++++
 cygwin/i686/i686-pc-cygwin-w32api-runtime.spec     |  153 ++++++++++++++++++++
 cygwin/i686/target-w32api-headers.add              |   18 +++
 cygwin/i686/target-w32api-runtime.add              |   18 +++
 cygwin/i686/w32api-headers.add                     |   37 +++++
 cygwin/i686/w32api-runtime.add                     |   37 +++++
 cygwin/w32api-headers.am                           |   21 +++
 cygwin/w32api-runtime.am                           |   21 +++
 cygwin/x86_64/Makefile.am                          |    8 +
 cygwin/x86_64/Makefile.in                          |   49 ++++++-
 cygwin/x86_64/target-w32api-headers.add            |   18 +++
 cygwin/x86_64/target-w32api-runtime.add            |   18 +++
 cygwin/x86_64/w32api-headers.add                   |   37 +++++
 cygwin/x86_64/w32api-runtime.add                   |   37 +++++
 cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec |  153 ++++++++++++++++++++
 cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec |  153 ++++++++++++++++++++
 18 files changed, 982 insertions(+), 9 deletions(-)

diff --git a/cygwin/i686/Makefile.am b/cygwin/i686/Makefile.am
index c00a903..6d47560 100644
--- a/cygwin/i686/Makefile.am
+++ b/cygwin/i686/Makefile.am
@@ -50,6 +50,14 @@ MPFR_VERS = 3.1.2-1
 MPFR_RPMREL = 0.20131210.0%{?dist}
 include ../mpfr.am
 
+W32API_HEADERS_VERS = 3.0.0-1
+W32API_HEADERS_RPMREL = 0.20131212.0%{?dist}
+include ../w32api-headers.am
+
+W32API_RUNTIME_VERS = 3.0.0-1
+W32API_RUNTIME_RPMREL = 0.20131212.0%{?dist}
+include ../w32api-runtime.am
+
 BINUTILS_VERS = 2.23.51-1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
 BINUTILS_RPMREL = 0.20131211.0
diff --git a/cygwin/i686/Makefile.in b/cygwin/i686/Makefile.in
index cba71d0..e38df18 100644
--- a/cygwin/i686/Makefile.in
+++ b/cygwin/i686/Makefile.in
@@ -84,6 +84,7 @@ DIST_COMMON = $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am \
 	$(srcdir)/../readline.am $(srcdir)/../termcap.am \
 	$(srcdir)/../terminfo.am $(srcdir)/../zlib.am \
 	$(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am \
+	$(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am \
 	$(srcdir)/../binutils.am $(srcdir)/../gcc.am \
 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am
 @CUSTOM_RPMPREFIX_TRUE at am__append_1 = @rpmprefix@$(TARGET)-binutils.spec
@@ -216,6 +217,8 @@ noinst_DATA = @rpmprefix@$(TARGET)-libs.spec \
 	@rpmprefix@$(TARGET)-terminfo.spec \
 	@rpmprefix@$(TARGET)-zlib.spec @rpmprefix@$(TARGET)-gmp.spec \
 	@rpmprefix@$(TARGET)-mpc.spec @rpmprefix@$(TARGET)-mpfr.spec \
+	@rpmprefix@$(TARGET)-w32api-headers.spec \
+	@rpmprefix@$(TARGET)-w32api-runtime.spec \
 	@rpmprefix@$(TARGET)-binutils.spec \
 	@rpmprefix@$(TARGET)-gcc.spec
 CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
@@ -230,15 +233,22 @@ CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
 	@rpmprefix@$(TARGET)-zlib.spec $(TARGET)-gmp.spec.in \
 	@rpmprefix@$(TARGET)-gmp.spec $(TARGET)-mpc.spec.in \
 	@rpmprefix@$(TARGET)-mpc.spec $(TARGET)-mpfr.spec.in \
-	@rpmprefix@$(TARGET)-mpfr.spec $(TARGET)-binutils.spec.in \
-	$(am__append_1) $(TARGET)-gcc.spec.in $(am__append_2)
+	@rpmprefix@$(TARGET)-mpfr.spec \
+	$(TARGET)-w32api-headers.spec.in \
+	@rpmprefix@$(TARGET)-w32api-headers.spec \
+	$(TARGET)-w32api-runtime.spec.in \
+	@rpmprefix@$(TARGET)-w32api-runtime.spec \
+	$(TARGET)-binutils.spec.in $(am__append_1) \
+	$(TARGET)-gcc.spec.in $(am__append_2)
 EXTRA_DIST = libs.add target-libs.add target-cloog-ppl.add \
 	cloog-ppl.add target-w32api.add w32api.add target-ncurses.add \
 	ncurses.add target-expat.add expat.add target-readline.add \
 	readline.add target-termcap.add termcap.add \
 	target-terminfo.add terminfo.add target-zlib.add zlib.add \
 	target-gmp.add gmp.add target-mpc.add mpc.add target-mpfr.add \
-	mpfr.add binutils-sources.add $(BINUTILS_SUBPACKAGES) \
+	mpfr.add target-w32api-headers.add w32api-headers.add \
+	target-w32api-runtime.add w32api-runtime.add \
+	binutils-sources.add $(BINUTILS_SUBPACKAGES) \
 	$(srcdir)/../gcc-prep.add $(srcdir)/gcc-sources.add \
 	$(GCC_SUBPACKAGES)
 SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
@@ -314,6 +324,18 @@ MPFR_RPMREL = 0.20131210.0%{?dist}
 MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/mpfr.add \
 	$(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-mpfr.add
+W32API_HEADERS_VERS = 3.0.0-1
+W32API_HEADERS_RPMREL = 0.20131212.0%{?dist}
+W32API_HEADERS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+	$(srcdir)/w32api-headers.add $(top_srcdir)/gcc/rpm-install.add \
+	$(top_srcdir)/common/clean.add \
+	$(srcdir)/target-w32api-headers.add
+W32API_RUNTIME_VERS = 3.0.0-1
+W32API_RUNTIME_RPMREL = 0.20131212.0%{?dist}
+W32API_RUNTIME_SUBPACKAGES = $(top_srcdir)/common/common.add \
+	$(srcdir)/w32api-runtime.add $(top_srcdir)/gcc/rpm-install.add \
+	$(top_srcdir)/common/clean.add \
+	$(srcdir)/target-w32api-runtime.add
 BINUTILS_VERS = 2.23.51-1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
 BINUTILS_RPMREL = 0.20131211.0
@@ -345,7 +367,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -366,7 +388,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am:
+$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../w32api.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../termcap.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(srcdir)/../gcc.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -648,6 +670,26 @@ $(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am $(srcdir)/../mpfr.am
 @rpmprefix@$(TARGET)-mpfr.spec: $(TARGET)-mpfr.spec.in
 	$(MKSPEC) $(TARGET)-mpfr.spec.in | $(SPECSTRIP) > $@
 
+$(TARGET)-w32api-headers.spec.in: $(W32API_HEADERS_SUBPACKAGES) Makefile.am
+	cat $(W32API_HEADERS_SUBPACKAGES) | sed \
+	  -e "s/[@]W32API_HEADERS_VERS[@]/$(W32API_HEADERS_VERS)/g" \
+	  -e "s/[@]W32API_HEADERS_RPMREL[@]/$(W32API_HEADERS_RPMREL)/g" \
+	  -e "s,%{gcc_rpmvers},%{w32api_headers_rpmvers},g" \
+	| $(MKSPEC0) > $(TARGET)-w32api-headers.spec.in
+
+ at rpmprefix@$(TARGET)-w32api-headers.spec: $(TARGET)-w32api-headers.spec.in
+	$(MKSPEC) $(TARGET)-w32api-headers.spec.in | $(SPECSTRIP) > $@
+
+$(TARGET)-w32api-runtime.spec.in: $(W32API_RUNTIME_SUBPACKAGES) Makefile.am
+	cat $(W32API_RUNTIME_SUBPACKAGES) | sed \
+	  -e "s/[@]W32API_RUNTIME_VERS[@]/$(W32API_RUNTIME_VERS)/g" \
+	  -e "s/[@]W32API_RUNTIME_RPMREL[@]/$(W32API_RUNTIME_RPMREL)/g" \
+	  -e "s,%{gcc_rpmvers},%{w32api_runtime_rpmvers},g" \
+	| $(MKSPEC0) > $(TARGET)-w32api-runtime.spec.in
+
+ at rpmprefix@$(TARGET)-w32api-runtime.spec: $(TARGET)-w32api-runtime.spec.in
+	$(MKSPEC) $(TARGET)-w32api-runtime.spec.in | $(SPECSTRIP) > $@
+
 $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add $(srcdir)/../binutils.am
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
diff --git a/cygwin/i686/i686-pc-cygwin-w32api-headers.spec b/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
new file mode 100644
index 0000000..dd57dfd
--- /dev/null
+++ b/cygwin/i686/i686-pc-cygwin-w32api-headers.spec
@@ -0,0 +1,153 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+
+%ifos cygwin cygwin32 mingw mingw32
+%define _exeext .exe
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix %{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%{?!el5:%global _with_noarch_subpackages 1}
+%define w32api_headers_version 3.0.0-1
+%define w32api_headers_rpmvers %{expand:%(echo 3.0.0-1 | tr - _)} 
+
+Name:         i686-pc-cygwin-w32api-headers
+Release:      0.20131212.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_headers_rpmvers
+Summary:      	MinGW-w64 Windows API headers for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-headers-%{w32api_headers_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API headers for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf i686-pc-cygwin
+
+  mkdir -p i686-pc-cygwin
+  ( cd i686-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p i686-pc-cygwin/sys-root
+  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
+
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+  b=$(basename $a)
+  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+< os_install_post~ > os_install_post 
+%define __os_install_post . ./os_install_post
+
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-provides
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-provides
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-requires
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-requires
+
+%ifnarch noarch
+# Extract %%__debug_install_post into debug_install_post~
+cat << \EOF > debug_install_post~
+%__debug_install_post
+EOF
+
+# Generate customized debug_install_post script
+cat debug_install_post~ | while read a x y; do
+case $a in
+# Prevent find-debuginfo.sh* from trying to handle foreign binaries
+*/find-debuginfo.sh)
+  b=$(basename $a)
+  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
+< debug_install_post~ > debug_install_post 
+%define __debug_install_post . ./debug_install_post
+
+%endif
+
+%clean
+  rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/i686-pc-cygwin
+%{_prefix}/i686-pc-cygwin/include
+
+%package sys-root
+Group: Development/Tools
+Summary: i686-pc-cygwin target files for gcc >= 3.4
+
+%description sys-root
+i686-pc-cygwin target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/i686-pc-cygwin
+%{_prefix}/i686-pc-cygwin/sys-root
+
+
diff --git a/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec b/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
new file mode 100644
index 0000000..090f040
--- /dev/null
+++ b/cygwin/i686/i686-pc-cygwin-w32api-runtime.spec
@@ -0,0 +1,153 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+
+%ifos cygwin cygwin32 mingw mingw32
+%define _exeext .exe
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix %{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%{?!el5:%global _with_noarch_subpackages 1}
+%define w32api_runtime_version 3.0.0-1
+%define w32api_runtime_rpmvers %{expand:%(echo 3.0.0-1 | tr - _)} 
+
+Name:         i686-pc-cygwin-w32api-runtime
+Release:      0.20131212.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_runtime_rpmvers
+Summary:      	MinGW-w64 Windows API runtime for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API runtime for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf i686-pc-cygwin
+
+  mkdir -p i686-pc-cygwin
+  ( cd i686-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p i686-pc-cygwin/sys-root
+  ( cd i686-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a i686-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
+
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+  b=$(basename $a)
+  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+< os_install_post~ > os_install_post 
+%define __os_install_post . ./os_install_post
+
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-provides
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_provides
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-provides
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-requires
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i686-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i686-pc-cygwin/'} | %__find_requires
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-requires
+
+%ifnarch noarch
+# Extract %%__debug_install_post into debug_install_post~
+cat << \EOF > debug_install_post~
+%__debug_install_post
+EOF
+
+# Generate customized debug_install_post script
+cat debug_install_post~ | while read a x y; do
+case $a in
+# Prevent find-debuginfo.sh* from trying to handle foreign binaries
+*/find-debuginfo.sh)
+  b=$(basename $a)
+  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
+< debug_install_post~ > debug_install_post 
+%define __debug_install_post . ./debug_install_post
+
+%endif
+
+%clean
+  rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/i686-pc-cygwin
+%{_prefix}/i686-pc-cygwin/include
+%{_prefix}/i686-pc-cygwin/lib
+
+%package sys-root
+Group: Development/Tools
+Summary: i686-pc-cygwin target files for gcc >= 3.4
+
+%description sys-root
+i686-pc-cygwin target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/i686-pc-cygwin
+%{_prefix}/i686-pc-cygwin/sys-root
+
diff --git a/cygwin/i686/target-w32api-headers.add b/cygwin/i686/target-w32api-headers.add
new file mode 100644
index 0000000..09a2585
--- /dev/null
+++ b/cygwin/i686/target-w32api-headers.add
@@ -0,0 +1,18 @@
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/include
+
+%package sys-root
+Group: Development/Tools
+Summary: @tool_target@ target files for gcc >= 3.4
+
+%description sys-root
+ at tool_target@ target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/sys-root
+
+
diff --git a/cygwin/i686/target-w32api-runtime.add b/cygwin/i686/target-w32api-runtime.add
new file mode 100644
index 0000000..1d572f4
--- /dev/null
+++ b/cygwin/i686/target-w32api-runtime.add
@@ -0,0 +1,18 @@
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/include
+%{_prefix}/@tool_target@/lib
+
+%package sys-root
+Group: Development/Tools
+Summary: @tool_target@ target files for gcc >= 3.4
+
+%description sys-root
+ at tool_target@ target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/sys-root
+
diff --git a/cygwin/i686/w32api-headers.add b/cygwin/i686/w32api-headers.add
new file mode 100644
index 0000000..296e617
--- /dev/null
+++ b/cygwin/i686/w32api-headers.add
@@ -0,0 +1,37 @@
+%define w32api_headers_version @W32API_HEADERS_VERS@
+%define w32api_headers_rpmvers %{expand:%(echo @W32API_HEADERS_VERS@ | tr - _)} 
+
+Name:         @rpmprefix@@tool_target at -w32api-headers
+Release:      @W32API_HEADERS_RPMREL@
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_headers_rpmvers
+Summary:      	MinGW-w64 Windows API headers for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-headers-%{w32api_headers_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API headers for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf @tool_target@
+
+  mkdir -p @tool_target@
+  ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p @tool_target@/sys-root
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
+
diff --git a/cygwin/i686/w32api-runtime.add b/cygwin/i686/w32api-runtime.add
new file mode 100644
index 0000000..59f769c
--- /dev/null
+++ b/cygwin/i686/w32api-runtime.add
@@ -0,0 +1,37 @@
+%define w32api_runtime_version @W32API_RUNTIME_VERS@
+%define w32api_runtime_rpmvers %{expand:%(echo @W32API_RUNTIME_VERS@ | tr - _)} 
+
+Name:         @rpmprefix@@tool_target at -w32api-runtime
+Release:      @W32API_RUNTIME_RPMREL@
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_runtime_rpmvers
+Summary:      	MinGW-w64 Windows API runtime for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API runtime for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf @tool_target@
+
+  mkdir -p @tool_target@
+  ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p @tool_target@/sys-root
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
+
diff --git a/cygwin/w32api-headers.am b/cygwin/w32api-headers.am
new file mode 100644
index 0000000..f593c2a
--- /dev/null
+++ b/cygwin/w32api-headers.am
@@ -0,0 +1,21 @@
+EXTRA_DIST += target-w32api-headers.add
+EXTRA_DIST += w32api-headers.add
+
+W32API_HEADERS_SUBPACKAGES = $(top_srcdir)/common/common.add
+W32API_HEADERS_SUBPACKAGES += $(srcdir)/w32api-headers.add
+W32API_HEADERS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
+W32API_HEADERS_SUBPACKAGES += $(top_srcdir)/common/clean.add
+W32API_HEADERS_SUBPACKAGES += $(srcdir)/target-w32api-headers.add
+
+$(TARGET)-w32api-headers.spec.in: $(W32API_HEADERS_SUBPACKAGES) Makefile.am
+	cat $(W32API_HEADERS_SUBPACKAGES) | sed \
+	  -e "s/[@]W32API_HEADERS_VERS[@]/$(W32API_HEADERS_VERS)/g" \
+	  -e "s/[@]W32API_HEADERS_RPMREL[@]/$(W32API_HEADERS_RPMREL)/g" \
+	  -e "s,%{gcc_rpmvers},%{w32api_headers_rpmvers},g" \
+	| $(MKSPEC0) > $(TARGET)-w32api-headers.spec.in
+CLEANFILES += $(TARGET)-w32api-headers.spec.in
+	                      
+ at rpmprefix@$(TARGET)-w32api-headers.spec: $(TARGET)-w32api-headers.spec.in
+	$(MKSPEC) $(TARGET)-w32api-headers.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += @rpmprefix@$(TARGET)-w32api-headers.spec
+noinst_DATA += @rpmprefix@$(TARGET)-w32api-headers.spec
diff --git a/cygwin/w32api-runtime.am b/cygwin/w32api-runtime.am
new file mode 100644
index 0000000..7ab822d
--- /dev/null
+++ b/cygwin/w32api-runtime.am
@@ -0,0 +1,21 @@
+EXTRA_DIST += target-w32api-runtime.add
+EXTRA_DIST += w32api-runtime.add
+
+W32API_RUNTIME_SUBPACKAGES = $(top_srcdir)/common/common.add
+W32API_RUNTIME_SUBPACKAGES += $(srcdir)/w32api-runtime.add
+W32API_RUNTIME_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
+W32API_RUNTIME_SUBPACKAGES += $(top_srcdir)/common/clean.add
+W32API_RUNTIME_SUBPACKAGES += $(srcdir)/target-w32api-runtime.add
+
+$(TARGET)-w32api-runtime.spec.in: $(W32API_RUNTIME_SUBPACKAGES) Makefile.am
+	cat $(W32API_RUNTIME_SUBPACKAGES) | sed \
+	  -e "s/[@]W32API_RUNTIME_VERS[@]/$(W32API_RUNTIME_VERS)/g" \
+	  -e "s/[@]W32API_RUNTIME_RPMREL[@]/$(W32API_RUNTIME_RPMREL)/g" \
+	  -e "s,%{gcc_rpmvers},%{w32api_runtime_rpmvers},g" \
+	| $(MKSPEC0) > $(TARGET)-w32api-runtime.spec.in
+CLEANFILES += $(TARGET)-w32api-runtime.spec.in
+	                      
+ at rpmprefix@$(TARGET)-w32api-runtime.spec: $(TARGET)-w32api-runtime.spec.in
+	$(MKSPEC) $(TARGET)-w32api-runtime.spec.in | $(SPECSTRIP) > $@
+CLEANFILES += @rpmprefix@$(TARGET)-w32api-runtime.spec
+noinst_DATA += @rpmprefix@$(TARGET)-w32api-runtime.spec
diff --git a/cygwin/x86_64/Makefile.am b/cygwin/x86_64/Makefile.am
index b433859..991d171 100644
--- a/cygwin/x86_64/Makefile.am
+++ b/cygwin/x86_64/Makefile.am
@@ -42,6 +42,14 @@ MPFR_VERS = 3.1.2-1
 MPFR_RPMREL = 0.20131210.0%{?dist}
 include ../mpfr.am
 
+W32API_HEADERS_VERS = 3.0.0-1
+W32API_HEADERS_RPMREL = 0.20131212.0%{?dist}
+include ../w32api-headers.am
+
+W32API_RUNTIME_VERS = 3.0.0-1
+W32API_RUNTIME_RPMREL = 0.20131212.0%{?dist}
+include ../w32api-runtime.am
+
 BINUTILS_VERS = 2.23.52-5
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
 BINUTILS_RPMREL = 0.20131211.0
diff --git a/cygwin/x86_64/Makefile.in b/cygwin/x86_64/Makefile.in
index e1c627a..fe1b527 100644
--- a/cygwin/x86_64/Makefile.in
+++ b/cygwin/x86_64/Makefile.in
@@ -83,6 +83,7 @@ DIST_COMMON = $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am \
 	$(srcdir)/../expat.am $(srcdir)/../readline.am \
 	$(srcdir)/../terminfo.am $(srcdir)/../zlib.am \
 	$(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am \
+	$(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am \
 	$(srcdir)/../binutils.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am
 @CUSTOM_RPMPREFIX_TRUE at am__append_1 = @rpmprefix@$(TARGET)-binutils.spec
@@ -212,6 +213,8 @@ noinst_DATA = @rpmprefix@$(TARGET)-libs.spec \
 	@rpmprefix@$(TARGET)-terminfo.spec \
 	@rpmprefix@$(TARGET)-zlib.spec @rpmprefix@$(TARGET)-gmp.spec \
 	@rpmprefix@$(TARGET)-mpc.spec @rpmprefix@$(TARGET)-mpfr.spec \
+	@rpmprefix@$(TARGET)-w32api-headers.spec \
+	@rpmprefix@$(TARGET)-w32api-runtime.spec \
 	@rpmprefix@$(TARGET)-binutils.spec
 CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
 	$(TARGET)-cloog-ppl.spec.in \
@@ -223,13 +226,19 @@ CLEANFILES = $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec \
 	@rpmprefix@$(TARGET)-zlib.spec $(TARGET)-gmp.spec.in \
 	@rpmprefix@$(TARGET)-gmp.spec $(TARGET)-mpc.spec.in \
 	@rpmprefix@$(TARGET)-mpc.spec $(TARGET)-mpfr.spec.in \
-	@rpmprefix@$(TARGET)-mpfr.spec $(TARGET)-binutils.spec.in \
-	$(am__append_1)
+	@rpmprefix@$(TARGET)-mpfr.spec \
+	$(TARGET)-w32api-headers.spec.in \
+	@rpmprefix@$(TARGET)-w32api-headers.spec \
+	$(TARGET)-w32api-runtime.spec.in \
+	@rpmprefix@$(TARGET)-w32api-runtime.spec \
+	$(TARGET)-binutils.spec.in $(am__append_1)
 EXTRA_DIST = libs.add target-libs.add target-cloog-ppl.add \
 	cloog-ppl.add target-ncurses.add ncurses.add target-expat.add \
 	expat.add target-readline.add readline.add target-terminfo.add \
 	terminfo.add target-zlib.add zlib.add target-gmp.add gmp.add \
 	target-mpc.add mpc.add target-mpfr.add mpfr.add \
+	target-w32api-headers.add w32api-headers.add \
+	target-w32api-runtime.add w32api-runtime.add \
 	binutils-sources.add $(BINUTILS_SUBPACKAGES)
 SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS)
 MKSPEC = sed \
@@ -294,6 +303,18 @@ MPFR_RPMREL = 0.20131210.0%{?dist}
 MPFR_SUBPACKAGES = $(top_srcdir)/common/common.add $(srcdir)/mpfr.add \
 	$(top_srcdir)/gcc/rpm-install.add \
 	$(top_srcdir)/common/clean.add $(srcdir)/target-mpfr.add
+W32API_HEADERS_VERS = 3.0.0-1
+W32API_HEADERS_RPMREL = 0.20131212.0%{?dist}
+W32API_HEADERS_SUBPACKAGES = $(top_srcdir)/common/common.add \
+	$(srcdir)/w32api-headers.add $(top_srcdir)/gcc/rpm-install.add \
+	$(top_srcdir)/common/clean.add \
+	$(srcdir)/target-w32api-headers.add
+W32API_RUNTIME_VERS = 3.0.0-1
+W32API_RUNTIME_RPMREL = 0.20131212.0%{?dist}
+W32API_RUNTIME_SUBPACKAGES = $(top_srcdir)/common/common.add \
+	$(srcdir)/w32api-runtime.add $(top_srcdir)/gcc/rpm-install.add \
+	$(top_srcdir)/common/clean.add \
+	$(srcdir)/target-w32api-runtime.add
 BINUTILS_VERS = 2.23.52-5
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
 BINUTILS_RPMREL = 0.20131211.0
@@ -310,7 +331,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../binutils.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -331,7 +352,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../binutils.am:
+$(top_srcdir)/mkspec.am $(srcdir)/../cygwin.am $(srcdir)/../cloog_ppl.am $(srcdir)/../ncurses.am $(srcdir)/../expat.am $(srcdir)/../readline.am $(srcdir)/../terminfo.am $(srcdir)/../zlib.am $(srcdir)/../gmp.am $(srcdir)/../mpc.am $(srcdir)/../mpfr.am $(srcdir)/../w32api-headers.am $(srcdir)/../w32api-runtime.am $(srcdir)/../binutils.am:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -593,6 +614,26 @@ $(TARGET)-mpfr.spec.in: $(MPFR_SUBPACKAGES) Makefile.am $(srcdir)/../mpfr.am
 @rpmprefix@$(TARGET)-mpfr.spec: $(TARGET)-mpfr.spec.in
 	$(MKSPEC) $(TARGET)-mpfr.spec.in | $(SPECSTRIP) > $@
 
+$(TARGET)-w32api-headers.spec.in: $(W32API_HEADERS_SUBPACKAGES) Makefile.am
+	cat $(W32API_HEADERS_SUBPACKAGES) | sed \
+	  -e "s/[@]W32API_HEADERS_VERS[@]/$(W32API_HEADERS_VERS)/g" \
+	  -e "s/[@]W32API_HEADERS_RPMREL[@]/$(W32API_HEADERS_RPMREL)/g" \
+	  -e "s,%{gcc_rpmvers},%{w32api_headers_rpmvers},g" \
+	| $(MKSPEC0) > $(TARGET)-w32api-headers.spec.in
+
+ at rpmprefix@$(TARGET)-w32api-headers.spec: $(TARGET)-w32api-headers.spec.in
+	$(MKSPEC) $(TARGET)-w32api-headers.spec.in | $(SPECSTRIP) > $@
+
+$(TARGET)-w32api-runtime.spec.in: $(W32API_RUNTIME_SUBPACKAGES) Makefile.am
+	cat $(W32API_RUNTIME_SUBPACKAGES) | sed \
+	  -e "s/[@]W32API_RUNTIME_VERS[@]/$(W32API_RUNTIME_VERS)/g" \
+	  -e "s/[@]W32API_RUNTIME_RPMREL[@]/$(W32API_RUNTIME_RPMREL)/g" \
+	  -e "s,%{gcc_rpmvers},%{w32api_runtime_rpmvers},g" \
+	| $(MKSPEC0) > $(TARGET)-w32api-runtime.spec.in
+
+ at rpmprefix@$(TARGET)-w32api-runtime.spec: $(TARGET)-w32api-runtime.spec.in
+	$(MKSPEC) $(TARGET)-w32api-runtime.spec.in | $(SPECSTRIP) > $@
+
 $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add $(srcdir)/../binutils.am
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \
diff --git a/cygwin/x86_64/target-w32api-headers.add b/cygwin/x86_64/target-w32api-headers.add
new file mode 100644
index 0000000..09a2585
--- /dev/null
+++ b/cygwin/x86_64/target-w32api-headers.add
@@ -0,0 +1,18 @@
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/include
+
+%package sys-root
+Group: Development/Tools
+Summary: @tool_target@ target files for gcc >= 3.4
+
+%description sys-root
+ at tool_target@ target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/sys-root
+
+
diff --git a/cygwin/x86_64/target-w32api-runtime.add b/cygwin/x86_64/target-w32api-runtime.add
new file mode 100644
index 0000000..1d572f4
--- /dev/null
+++ b/cygwin/x86_64/target-w32api-runtime.add
@@ -0,0 +1,18 @@
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/include
+%{_prefix}/@tool_target@/lib
+
+%package sys-root
+Group: Development/Tools
+Summary: @tool_target@ target files for gcc >= 3.4
+
+%description sys-root
+ at tool_target@ target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/@tool_target@
+%{_prefix}/@tool_target@/sys-root
+
diff --git a/cygwin/x86_64/w32api-headers.add b/cygwin/x86_64/w32api-headers.add
new file mode 100644
index 0000000..812943e
--- /dev/null
+++ b/cygwin/x86_64/w32api-headers.add
@@ -0,0 +1,37 @@
+%define w32api_headers_version @W32API_HEADERS_VERS@
+%define w32api_headers_rpmvers %{expand:%(echo @W32API_HEADERS_VERS@ | tr - _)} 
+
+Name:         @rpmprefix@@tool_target at -w32api-headers
+Release:      @W32API_HEADERS_RPMREL@
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_headers_rpmvers
+Summary:      	MinGW-w64 Windows API headers for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-headers-%{w32api_headers_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API headers for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf @tool_target@
+
+  mkdir -p @tool_target@
+  ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p @tool_target@/sys-root
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
+
diff --git a/cygwin/x86_64/w32api-runtime.add b/cygwin/x86_64/w32api-runtime.add
new file mode 100644
index 0000000..f3d2f2d
--- /dev/null
+++ b/cygwin/x86_64/w32api-runtime.add
@@ -0,0 +1,37 @@
+%define w32api_runtime_version @W32API_RUNTIME_VERS@
+%define w32api_runtime_rpmvers %{expand:%(echo @W32API_RUNTIME_VERS@ | tr - _)} 
+
+Name:         @rpmprefix@@tool_target at -w32api-runtime
+Release:      @W32API_RUNTIME_RPMREL@
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_runtime_rpmvers
+Summary:      	MinGW-w64 Windows API runtime for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API runtime for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf @tool_target@
+
+  mkdir -p @tool_target@
+  ( cd @tool_target@; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p @tool_target@/sys-root
+  ( cd @tool_target@/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a @tool_target@ $RPM_BUILD_ROOT%{_prefix}
+
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec b/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
new file mode 100644
index 0000000..d32b230
--- /dev/null
+++ b/cygwin/x86_64/x86_64-pc-cygwin-w32api-headers.spec
@@ -0,0 +1,153 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+
+%ifos cygwin cygwin32 mingw mingw32
+%define _exeext .exe
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix %{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%{?!el5:%global _with_noarch_subpackages 1}
+%define w32api_headers_version 3.0.0-1
+%define w32api_headers_rpmvers %{expand:%(echo 3.0.0-1 | tr - _)} 
+
+Name:         x86_64-pc-cygwin-w32api-headers
+Release:      0.20131212.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_headers_rpmvers
+Summary:      	MinGW-w64 Windows API headers for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-headers-%{w32api_headers_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API headers for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf x86_64-pc-cygwin
+
+  mkdir -p x86_64-pc-cygwin
+  ( cd x86_64-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p x86_64-pc-cygwin/sys-root
+  ( cd x86_64-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a x86_64-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
+
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+  b=$(basename $a)
+  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+< os_install_post~ > os_install_post 
+%define __os_install_post . ./os_install_post
+
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-provides
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/x86_64-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/'} | %__find_provides
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-provides
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-requires
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/x86_64-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/'} | %__find_requires
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{w32api_headers_rpmvers}/find-requires
+
+%ifnarch noarch
+# Extract %%__debug_install_post into debug_install_post~
+cat << \EOF > debug_install_post~
+%__debug_install_post
+EOF
+
+# Generate customized debug_install_post script
+cat debug_install_post~ | while read a x y; do
+case $a in
+# Prevent find-debuginfo.sh* from trying to handle foreign binaries
+*/find-debuginfo.sh)
+  b=$(basename $a)
+  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
+< debug_install_post~ > debug_install_post 
+%define __debug_install_post . ./debug_install_post
+
+%endif
+
+%clean
+  rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/x86_64-pc-cygwin
+%{_prefix}/x86_64-pc-cygwin/include
+
+%package sys-root
+Group: Development/Tools
+Summary: x86_64-pc-cygwin target files for gcc >= 3.4
+
+%description sys-root
+x86_64-pc-cygwin target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/x86_64-pc-cygwin
+%{_prefix}/x86_64-pc-cygwin/sys-root
+
+
diff --git a/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec b/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
new file mode 100644
index 0000000..941189b
--- /dev/null
+++ b/cygwin/x86_64/x86_64-pc-cygwin-w32api-runtime.spec
@@ -0,0 +1,153 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+
+%ifos cygwin cygwin32 mingw mingw32
+%define _exeext .exe
+%define debug_package           %{nil}
+%define _libdir                 %{_exec_prefix}/lib
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%endif
+
+%ifos mingw mingw32
+%if %{defined _mingw32_cflags}
+%define optflags %{_mingw32_cflags}
+%else
+%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
+%endif
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix %{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+%{?!el5:%global _with_noarch_subpackages 1}
+%define w32api_runtime_version 3.0.0-1
+%define w32api_runtime_rpmvers %{expand:%(echo 3.0.0-1 | tr - _)} 
+
+Name:         x86_64-pc-cygwin-w32api-runtime
+Release:      0.20131212.0%{?dist}
+License:      GPL
+Group:        Development/Tools
+
+%{?el5BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
+BuildArch:	noarch
+
+Version:      	%w32api_runtime_rpmvers
+Summary:      	MinGW-w64 Windows API runtime for Cygwin
+
+Source0:	ftp://sources.redhat.com/pub/cygwin/x86_64/release/w32api/w32api-runtime-%{w32api_runtime_version}.tar.bz2
+
+%description
+MinGW-w64 Windows API runtime for Cygwin.
+
+%prep
+%setup -c -q -T -n %{name}-%{version}
+
+%build
+  rm -rf x86_64-pc-cygwin
+
+  mkdir -p x86_64-pc-cygwin
+  ( cd x86_64-pc-cygwin; %{__tar} xvf %{SOURCE0} --strip-components=1 usr/include usr/lib )
+
+  # Setup sys-root (Usable for gcc >= 3.4)
+  mkdir -p x86_64-pc-cygwin/sys-root
+  ( cd x86_64-pc-cygwin/sys-root ; %{__tar} xvf %{SOURCE0} usr/include usr/lib )
+
+%install
+  rm -rf $RPM_BUILD_ROOT
+  mkdir -p $RPM_BUILD_ROOT%{_prefix}
+  cp -a x86_64-pc-cygwin $RPM_BUILD_ROOT%{_prefix}
+
+# Extract %%__os_install_post into os_install_post~
+cat << \EOF > os_install_post~
+%__os_install_post
+EOF
+
+# Generate customized brp-*scripts
+cat os_install_post~ | while read a x y; do
+case $a in
+# Prevent brp-strip* from trying to handle foreign binaries
+*/brp-strip*)
+  b=$(basename $a)
+  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+< os_install_post~ > os_install_post 
+%define __os_install_post . ./os_install_post
+
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-provides
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/x86_64-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/'} | %__find_provides
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-provides
+
+cat << EOF > %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-requires
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/x86_64-pc-cygwin/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/x86_64-pc-cygwin/'} | %__find_requires
+EOF
+chmod +x %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{w32api_runtime_rpmvers}/find-requires
+
+%ifnarch noarch
+# Extract %%__debug_install_post into debug_install_post~
+cat << \EOF > debug_install_post~
+%__debug_install_post
+EOF
+
+# Generate customized debug_install_post script
+cat debug_install_post~ | while read a x y; do
+case $a in
+# Prevent find-debuginfo.sh* from trying to handle foreign binaries
+*/find-debuginfo.sh)
+  b=$(basename $a)
+  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
+  chmod a+x $b
+  ;;
+esac
+done
+
+sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
+< debug_install_post~ > debug_install_post 
+%define __debug_install_post . ./debug_install_post
+
+%endif
+
+%clean
+  rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%dir %{_prefix}/x86_64-pc-cygwin
+%{_prefix}/x86_64-pc-cygwin/include
+%{_prefix}/x86_64-pc-cygwin/lib
+
+%package sys-root
+Group: Development/Tools
+Summary: x86_64-pc-cygwin target files for gcc >= 3.4
+
+%description sys-root
+x86_64-pc-cygwin target files for gcc >= 3.4
+
+%files sys-root
+%defattr(-,root,root,-)
+%dir %{_prefix}/x86_64-pc-cygwin
+%{_prefix}/x86_64-pc-cygwin/sys-root
+

More information about the vc mailing list