summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2013-06-28 03:02:48 -0500
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2013-06-28 03:02:48 -0500
commita487cd8ea554a9ce2cbcf3185f550a7fa10a0176 (patch)
tree51235fb24a076f833ccb4146698d36e1a0d080c2
parent62c1b58fade21a705a59e441feca64a527097c57 (diff)
downloadcygwin-a487cd8ea554a9ce2cbcf3185f550a7fa10a0176.tar.gz
cygwin-a487cd8ea554a9ce2cbcf3185f550a7fa10a0176.tar.xz
cygwin-a487cd8ea554a9ce2cbcf3185f550a7fa10a0176.zip
Add cygwin64
-rw-r--r--cygwin.spec52
1 files changed, 51 insertions, 1 deletions
diff --git a/cygwin.spec b/cygwin.spec
index 8017200..ec3c017 100644
--- a/cygwin.spec
+++ b/cygwin.spec
@@ -22,6 +22,16 @@ BuildRequires: cygwin32-w32api-headers
BuildRequires: cygwin32-w32api-runtime
BuildRequires: mingw32-crt
BuildRequires: mingw32-headers
+
+BuildRequires: cygwin64-filesystem >= 7
+BuildRequires: cygwin64-binutils
+BuildRequires: cygwin64-gcc
+BuildRequires: cygwin64-gcc-c++
+BuildRequires: cygwin64-w32api-headers
+BuildRequires: cygwin64-w32api-runtime
+BuildRequires: mingw64-crt
+BuildRequires: mingw64-headers
+
BuildRequires: xmlto
%description
@@ -36,6 +46,13 @@ Obsoletes: cygwin < %{version}-%{release}
%description -n cygwin32
Cygwin 32-bit cross-compiler runtime, base libraries.
+%package -n cygwin64
+Summary: Cygwin64 cross-compiler runtime
+Requires: cygwin64-w32api-runtime
+
+%description -n cygwin64
+Cygwin 64-bit cross-compiler runtime, base libraries.
+
%prep
%setup -q -n src
@@ -51,7 +68,17 @@ pushd build_cyg32
--target=%{cygwin32_target}
make %{?_smp_mflags} all
+popd
+
+mkdir -p build_cyg64
+pushd build_cyg64
+
+`pwd`/../configure \
+ --prefix=%{cygwin64_prefix} \
+ --build=%_build --host=%_host \
+ --target=%{cygwin64_target}
+make %{?_smp_mflags} all
popd
@@ -60,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
pushd build_cyg32
make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{cygwin32_prefix}
+popd
+
+pushd build_cyg64
+make DESTDIR=$RPM_BUILD_ROOT install tooldir=%{cygwin64_prefix}
+popd
# remove files not needed for cross-compiling
rm -fr $RPM_BUILD_ROOT%{cygwin32_prefix}/etc
@@ -71,10 +103,22 @@ rm -fr $RPM_BUILD_ROOT%{cygwin32_docdir}
rm -fr $RPM_BUILD_ROOT%{cygwin32_infodir}
rm -fr $RPM_BUILD_ROOT%{cygwin32_mandir}
+rm -fr $RPM_BUILD_ROOT%{cygwin64_prefix}/etc
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/cyglsa*
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/cygserver-config
+rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
+rm -fr $RPM_BUILD_ROOT%{cygwin64_sbindir}
+rm -fr $RPM_BUILD_ROOT%{cygwin64_docdir}
+rm -fr $RPM_BUILD_ROOT%{cygwin64_infodir}
+rm -fr $RPM_BUILD_ROOT%{cygwin64_mandir}
+
# these are provided by other packages
rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/iconv.h
rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/unctrl.h
+rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/iconv.h
+rm -fr $RPM_BUILD_ROOT%{cygwin64_includedir}/unctrl.h
+
%files -n cygwin32
%doc winsup/COPYING winsup/CYGWIN_LICENSE
@@ -82,9 +126,15 @@ rm -fr $RPM_BUILD_ROOT%{cygwin32_includedir}/unctrl.h
%{cygwin32_includedir}/*
%{cygwin32_libdir}/*
+%files -n cygwin64
+%doc winsup/COPYING winsup/CYGWIN_LICENSE
+%{cygwin64_bindir}/cygwin1.dll
+%{cygwin64_includedir}/*
+%{cygwin64_libdir}/*
+
%changelog
-* Wed Jun 26 2013 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.20-1
+* Fri Jun 28 2013 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.7.20-1
- Version bump.
- Updated for new Cygwin packaging scheme.