about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch')
-rw-r--r--nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch b/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
deleted file mode 100644
index 16208385a9b9..000000000000
--- a/nixpkgs/pkgs/development/libraries/boost/cygwin-1.57.0-locale-cygwin.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- boost_1_57_0/libs/locale/build/Jamfile.v2	2014-04-06 08:11:49.000000000 -0500
-+++ boost_1_57_0/libs/locale/build/Jamfile.v2	2015-05-04 18:11:52.956846500 -0500
-@@ -261,7 +261,7 @@ rule configure-full ( properties * : fla
- 
-     }
-         
--    if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) && ! <target-os>cygwin in $(properties) 
-+    if ! $(found-iconv) && ! $(found-icu) && ! <target-os>windows in $(properties) 
-     {
-         ECHO "- Boost.Locale needs either iconv or ICU library to be built." ;
-         result += <build>no ;
-@@ -298,7 +298,6 @@ rule configure-full ( properties * : fla
-     if ! <boost.locale.winapi> in $(properties:G)
-     {
-         if <target-os>windows in $(properties) 
--          || <target-os>cygwin in $(properties)
-         {
-             properties += <boost.locale.winapi>on ;
-         }      
-@@ -335,7 +334,7 @@ rule configure-full ( properties * : fla
-     }
-     
-     if ( ! <boost.locale.winapi>off in $(properties) || ! <boost.locale.std>off in $(properties) )
--       && ( <target-os>windows in $(properties) || <target-os>cygwin in $(properties) )
-+       && <target-os>windows in $(properties)
-     {
-         result += <source>win32/lcid.cpp ;
-     }
---- boost_1_57_0/libs/locale/src/encoding/codepage.cpp	2014-04-06 08:11:49.000000000 -0500
-+++ boost_1_57_0/libs/locale/src/encoding/codepage.cpp	2015-05-04 23:16:01.778652600 -0500
-@@ -8,7 +8,7 @@
- #define BOOST_LOCALE_SOURCE
- #include <boost/config.hpp>
- 
--#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_WINDOWS)
- #define BOOST_LOCALE_WITH_WCONV
- #endif
- 
---- boost_1_57_0/libs/locale/src/encoding/conv.hpp	2014-04-06 08:11:49.000000000 -0500
-+++ boost_1_57_0/libs/locale/src/encoding/conv.hpp	2015-05-04 23:16:08.454000300 -0500
-@@ -59,7 +59,7 @@ namespace boost {
-                     return normalize_encoding(l).compare(normalize_encoding(r));
-                 }
-             
--                #if defined(BOOST_WINDOWS)  || defined(__CYGWIN__)
-+                #if defined(BOOST_WINDOWS)
-                 int encoding_to_windows_codepage(char const *ccharset);
-                 #endif
-             
---- boost_1_57_0/libs/locale/src/util/default_locale.cpp	2014-04-06 08:11:49.000000000 -0500
-+++ boost_1_57_0/libs/locale/src/util/default_locale.cpp	2015-05-04 23:16:16.311998100 -0500
-@@ -15,7 +15,7 @@
- #  pragma warning(disable : 4996)
- #endif
- 
--#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
-+#if defined(BOOST_WINDOWS)
- #ifndef NOMINMAX
- #define NOMINMAX
- #endif
---- boost_1_57_0/libs/locale/test/test_codepage.cpp	2014-04-06 08:11:49.000000000 -0500
-+++ boost_1_57_0/libs/locale/test/test_codepage.cpp	2015-05-04 23:16:40.883618300 -0500
-@@ -23,7 +23,7 @@
- # include <locale.h>
- #endif
- 
--#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__))
-+#if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS)
- #ifndef NOMINMAX
- # define NOMINMAX
- #endif
-@@ -395,7 +395,7 @@ int main()
-         def.push_back("posix");
-         #endif
- 
--        #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && (defined(BOOST_WINDOWS) || defined(__CYGWIN__))
-+        #if !defined(BOOST_LOCALE_WITH_ICU) && !defined(BOOST_LOCALE_WITH_ICONV) && defined(BOOST_WINDOWS)
-         test_iso_8859_8 = IsValidCodePage(28598)!=0;
-         #endif
-