diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 21:05:09 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 22:01:33 -0500 |
| commit | e51c76a24d3b1f8128133393d036a2c5401f9720 (patch) | |
| tree | bfaa2d9d27ff6c5214f7046bfb9fd4cd0e3356aa | |
| parent | d2bf9b8827eda5b57341c8a2013314b822b09671 (diff) | |
| download | cygwin-filesystem-e51c76a24d3b1f8128133393d036a2c5401f9720.tar.gz cygwin-filesystem-e51c76a24d3b1f8128133393d036a2c5401f9720.tar.xz cygwin-filesystem-e51c76a24d3b1f8128133393d036a2c5401f9720.zip | |
Rename Toolchain-cygwin{32,64}.cmake to toolchain-cygwin{32,64}.cmake
Based on mingw-filesystem commit faf1180f1185bd8887f6408cab9054df256fbd97.
| -rw-r--r-- | cygwin-filesystem.spec | 13 | ||||
| -rw-r--r-- | macros.cygwin32 | 2 | ||||
| -rw-r--r-- | macros.cygwin64 | 2 | ||||
| -rw-r--r-- | toolchain-cygwin32.cmake (renamed from Toolchain-cygwin32.cmake) | 0 | ||||
| -rw-r--r-- | toolchain-cygwin64.cmake (renamed from Toolchain-cygwin64.cmake) | 0 |
5 files changed, 10 insertions, 7 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index 8bf1f29..6582fee 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -6,7 +6,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: cygwin-filesystem -Version: 12 +Version: 13 Release: 1%{?dist} Summary: Cygwin cross compiler base filesystem and environment @@ -26,8 +26,8 @@ Source7: cygwin-find-requires.sh Source8: cygwin-find-provides.sh Source9: cygwin-scripts.sh Source10: cygwin-rpmlint.config -Source11: Toolchain-cygwin32.cmake -Source12: Toolchain-cygwin64.cmake +Source11: toolchain-cygwin32.cmake +Source12: toolchain-cygwin64.cmake Source13: cygwin-find-lang.sh Source14: cygwin32.attr Source15: cygwin64.attr @@ -231,7 +231,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ %{_bindir}/cygwin32-pkg-config %{_prefix}/i686-pc-cygwin %{_rpmconfigdir}/fileattrs/cygwin32.attr -%{_datadir}/cygwin/Toolchain-cygwin32.cmake +%{_datadir}/cygwin/toolchain-cygwin32.cmake %files -n cygwin64-filesystem %{macrosdir}/macros.cygwin64 @@ -242,10 +242,13 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ %{_bindir}/cygwin64-pkg-config %{_prefix}/x86_64-pc-cygwin %{_rpmconfigdir}/fileattrs/cygwin64.attr -%{_datadir}/cygwin/Toolchain-cygwin64.cmake +%{_datadir}/cygwin/toolchain-cygwin64.cmake %changelog +* Thu Jun 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 13-1 +- Rename Toolchain-cygwin{32,64}.cmake to toolchain-cygwin{32,64}.cmake + * Thu Jun 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 12-1 - Add cppflags, ldflags variables diff --git a/macros.cygwin32 b/macros.cygwin32 index d3042cf..8000033 100644 --- a/macros.cygwin32 +++ b/macros.cygwin32 @@ -170,7 +170,7 @@ package or when debugging this package. \ -DSHARE_INSTALL_PREFIX:PATH=%{cygwin32_datadir} \\\ %{?_cmake_skip_rpath} \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ - -DCMAKE_TOOLCHAIN_FILE=/usr/share/cygwin/Toolchain-cygwin32.cmake \\\ + -DCMAKE_TOOLCHAIN_FILE=/usr/share/cygwin/toolchain-cygwin32.cmake \\\ ${CYGWIN_CMAKE_ARGS} \\\ ${CYGWIN32_CMAKE_ARGS} diff --git a/macros.cygwin64 b/macros.cygwin64 index 30df8e9..0eaa1e3 100644 --- a/macros.cygwin64 +++ b/macros.cygwin64 @@ -188,7 +188,7 @@ package or when debugging this package. \ -DSHARE_INSTALL_PREFIX:PATH=%{cygwin64_datadir} \\\ %{?_cmake_skip_rpath} \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ - -DCMAKE_TOOLCHAIN_FILE=/usr/share/cygwin/Toolchain-cygwin64.cmake \\\ + -DCMAKE_TOOLCHAIN_FILE=/usr/share/cygwin/toolchain-cygwin64.cmake \\\ ${CYGWIN_CMAKE_ARGS} \\\ ${CYGWIN64_CMAKE_ARGS} diff --git a/Toolchain-cygwin32.cmake b/toolchain-cygwin32.cmake index b5e41ef..b5e41ef 100644 --- a/Toolchain-cygwin32.cmake +++ b/toolchain-cygwin32.cmake diff --git a/Toolchain-cygwin64.cmake b/toolchain-cygwin64.cmake index 4cd938d..4cd938d 100644 --- a/Toolchain-cygwin64.cmake +++ b/toolchain-cygwin64.cmake |