diff options
| -rw-r--r-- | cygwin-w32api-runtime.spec | 94 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | w32api-lib64dir.patch | 46 |
3 files changed, 102 insertions, 40 deletions
diff --git a/cygwin-w32api-runtime.spec b/cygwin-w32api-runtime.spec index 0cc0a37..3cd75d4 100644 --- a/cygwin-w32api-runtime.spec +++ b/cygwin-w32api-runtime.spec @@ -1,15 +1,11 @@ -%define __strip %{_cygwin_strip} -%define __objdump %{_cygwin_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_cygwin_findrequires} -%define __find_provides %{_cygwin_findprovides} +%{?cygwin_package_header} -%global snapshot_date 20121215 +%global snapshot_rev 5747 %global branch trunk Name: cygwin-w32api-runtime Version: 2.0.999 -Release: 0.13.%{branch}.%{snapshot_date} +Release: 0.15.%{branch}.svn%{snapshot_rev} Summary: Windows API libraries for Cygwin toolchain License: Public Domain and ZPLv2.1 @@ -17,67 +13,87 @@ Group: Development/Libraries URL: http://mingw-w64.sourceforge.net/ BuildArch: noarch -%if 0%{?snapshot_date} -# To regerenate a snapshot: -# wget http://mingw-w64.svn.sourceforge.net/viewvc/mingw-w64/%{branch}/?view=tar -O mingw-w64-%{branch}-snapshot-$(date '+%Y%m%d').tar.gz -Source0: mingw-w64-%{branch}-snapshot-%{snapshot_date}.tar.gz -%else -Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz -%endif +# To regenerate a snapshot: +# wget http://sourceforge.net/code-snapshots/svn/m/mi/mingw-w64/code/mingw-w64-code-%{snapshot_rev}-%{branch}.zip +Source0: mingw-w64-code-%{snapshot_rev}-%{branch}.zip +Patch0: w32api-lib64dir.patch -BuildRequires: cygwin-filesystem -BuildRequires: cygwin-binutils -BuildRequires: cygwin-w32api-headers >= %{version}-%{release} -BuildRequires: cygwin-gcc +BuildRequires: cygwin32-filesystem +BuildRequires: cygwin32-binutils +BuildRequires: cygwin32-w32api-headers >= %{version}-%{release} +BuildRequires: cygwin32-gcc -Requires: cygwin-filesystem -Requires: cygwin-w32api-headers >= %{version}-%{release} +BuildRequires: cygwin64-filesystem +BuildRequires: cygwin64-binutils +BuildRequires: cygwin64-w32api-headers >= %{version}-%{release} +BuildRequires: cygwin64-gcc +%description +Windows cross-compiler runtime base libraries for Cygwin toolchain. + +%package -n cygwin32-w32api-runtime +Summary: Windows API libraries for Cygwin32 toolchain +Requires: cygwin32-filesystem +Requires: cygwin32-w32api-headers >= %{version}-%{release} Obsoletes: cygwin-w32api < 3.17-4 Obsoletes: cygwin-w32api-libs +Obsoletes: cygwin-w32api-runtime < %{version}-%{release} Provides: cygwin-w32api = 3.17-4 Provides: cygwin-w32api-libs = %{version}-%{release} +Provides: cygwin-w32api-runtime < %{version}-%{release} -%description -MinGW Windows cross-compiler runtime, base libraries. +%description -n cygwin32-w32api-runtime +Windows cross-compiler runtime base libraries for Cygwin32 toolchain. + +%package -n cygwin64-w32api-runtime +Summary: Windows API libraries for Cygwin64 toolchain +Requires: cygwin64-filesystem +Requires: cygwin64-w32api-headers >= %{version}-%{release} + +%description -n cygwin64-w32api-runtime +Windows cross-compiler runtime base libraries for Cygwin64 toolchain. %prep -%if 0%{?snapshot_date} -rm -rf mingw-w64-v%{version} -mkdir mingw-w64-v%{version} -cd mingw-w64-v%{version} -tar -xf %{S:0} -%setup -q -D -T -n mingw-w64-v%{version}/%{branch} -%else -%setup -q -n mingw-w64-v%{version} -%endif +%setup -q -n mingw-w64-code-%{snapshot_rev}-%{branch} +%patch0 -p1 %build pushd mingw-w64-crt - %_cygwin_configure --enable-w32api --disable-lib64 - make %{?_smp_mflags} + CYGWIN32_CONFIGURE_ARGS="--disable-lib64" + CYGWIN64_CONFIGURE_ARGS="--disable-lib32" + %cygwin_configure --enable-w32api + %cygwin_make %{?_smp_mflags} popd %install pushd mingw-w64-crt - make install DESTDIR=$RPM_BUILD_ROOT + %cygwin_make_install DESTDIR=$RPM_BUILD_ROOT popd # Dunno what to do with these files -rm -rf $RPM_BUILD_ROOT%{_cygwin_includedir}/w32api/*.c +rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/w32api/*.c +rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/w32api/*.c + +%files -n cygwin32-w32api-runtime +%doc COPYING DISCLAIMER DISCLAIMER.PD +%{cygwin32_libdir}/w32api/ -%files +%files -n cygwin64-w32api-runtime %doc COPYING DISCLAIMER DISCLAIMER.PD -%{_cygwin_libdir}/w32api/ +%{cygwin64_libdir}/w32api/ %changelog -* Tue Oct 16 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-1.trunk.20121215 +* Thu Jun 27 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-0.15.trunk.r5747 +- Update to SVN trunk. +- Update to new Cygwin packaging scheme. + +* Tue Oct 16 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-0.13.trunk.20121215 - Change name and update to match current Cygwin package. -* Tue Oct 16 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-1.trunk.20121016 +* Tue Oct 16 2012 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2.0.999-0.13.trunk.20121016 - Replace mingw.org w32api with mingw-w64 to match Cygwin distribution. @@ -1 +1 @@ -2363c17abb6a627ba8bb08b38cf76075 mingw-w64-trunk-snapshot-20121215.tar.gz +348e0c6439141cc7d4ccbdb90982fb94 mingw-w64-code-5747-trunk.zip diff --git a/w32api-lib64dir.patch b/w32api-lib64dir.patch new file mode 100644 index 0000000..52cc6b6 --- /dev/null +++ b/w32api-lib64dir.patch @@ -0,0 +1,46 @@ +--- a/mingw-w64-crt/configure.ac (revision 5594) ++++ b/mingw-w64-crt/configure.ac (working copy) +@@ -118,10 +118,14 @@ + [AC_MSG_WARN([Building the runtime to use libce with lib32 or lib64 is unsupported.])])]) + + AS_CASE([$enable_w32api], +- [yes],[ ++ [yes],[AS_CASE([$host_cpu], ++ [x86_64],[ ++ AC_SUBST([LIB64SUFFIXDIR],[lib/w32api]) ++ AC_SUBST([LIB32SUFFIXDIR],[lib32/w32api])], ++ [i*86],[ + AC_SUBST([LIB64SUFFIXDIR],[lib64/w32api]) +- AC_SUBST([LIB32SUFFIXDIR],[lib/w32api]) +- ], ++ AC_SUBST([LIB32SUFFIXDIR],[lib/w32api])] ++ )], + [AS_CASE([$host_cpu], + [x86_64],[ + AC_SUBST([LIB64SUFFIXDIR],[lib]) +--- a/mingw-w64-crt/configure (revision 5594) ++++ b/mingw-w64-crt/configure (working copy) +@@ -5195,12 +5195,21 @@ fi + + case $enable_w32api in #( + yes) : ++ case $host_cpu in #( ++ x86_64) : ++ ++ LIB64SUFFIXDIR=lib/w32api ++ ++ LIB32SUFFIXDIR=lib32/w32api ++ ;; #( ++ i*86) : + + LIB64SUFFIXDIR=lib64/w32api + + LIB32SUFFIXDIR=lib/w32api +- +- ;; #( ++ ;; #( ++esac ++ ;; + *) : + case $host_cpu in #( + x86_64) : |