Last active
August 29, 2015 14:11
-
-
Save misterdjules/37263cf1dcbb879b2f50 to your computer and use it in GitHub Desktop.
Patch to make node's v0.12 branch build with --with-intl=small-icu on SmartOS
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iff -urN deps/icu/source/common/uposixdefs.h deps/icu-fixed/source/common/uposixdefs.h | |
--- deps/icu/source/common/uposixdefs.h 2014-12-16 17:18:32.854582544 +0000 | |
+++ deps/icu-fixed/source/common/uposixdefs.h 2014-12-16 17:18:12.725371488 +0000 | |
@@ -52,7 +52,7 @@ | |
* | |
* z/OS needs this definition for timeval and to get usleep. | |
*/ | |
-#if !defined(_XOPEN_SOURCE_EXTENDED) | |
+#if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sun) | |
# define _XOPEN_SOURCE_EXTENDED 1 | |
#endif | |
diff -urN deps/icu/source/tools/toolutil/udbgutil.cpp deps/icu-fixed/source/tools/toolutil/udbgutil.cpp | |
--- deps/icu/source/tools/toolutil/udbgutil.cpp 2014-12-16 17:18:33.962176775 +0000 | |
+++ deps/icu-fixed/source/tools/toolutil/udbgutil.cpp 2014-12-16 17:18:12.906122877 +0000 | |
@@ -603,7 +603,7 @@ | |
#if !U_HAVE_STD_STRING | |
-const char *warning = "WARNING: Don't have std::string (STL) - known issue logs will be deficient."; | |
+static const char *warning = "WARNING: Don't have std::string (STL) - known issue logs will be deficient."; | |
U_CAPI void *udbg_knownIssue_openU(void *ptr, const char *ticket, char *where, const UChar *msg, UBool *firstForTicket, | |
UBool *firstForWhere) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp | |
index 9193908..7ea6a62 100644 | |
--- a/tools/icu/icu-generic.gyp | |
+++ b/tools/icu/icu-generic.gyp | |
@@ -122,11 +122,6 @@ | |
'../../deps/icu/source/i18n/alphaindex.cpp', | |
# BOCSU | |
# misc | |
- '../../deps/icu/source/i18n/dtitvfmt.cpp', | |
- '../../deps/icu/source/i18n/dtitvinf.cpp', | |
- '../../deps/icu/source/i18n/dtitv_impl.h', | |
- '../../deps/icu/source/i18n/quantityformatter.cpp', | |
- '../../deps/icu/source/i18n/quantityformatter.h', | |
'../../deps/icu/source/i18n/regexcmp.cpp', | |
'../../deps/icu/source/i18n/regexcmp.h', | |
'../../deps/icu/source/i18n/regexcst.h', | |
@@ -139,9 +134,7 @@ | |
'../../deps/icu/source/i18n/region.cpp', | |
'../../deps/icu/source/i18n/region_impl.h', | |
'../../deps/icu/source/i18n/reldatefmt.cpp', | |
- '../../deps/icu/source/i18n/reldatefmt.h', | |
- '../../deps/icu/source/i18n/measfmt.h', | |
- '../../deps/icu/source/i18n/measfmt.cpp', | |
+ '../../deps/icu/source/i18n/reldatefmt.h' | |
'../../deps/icu/source/i18n/scientificformathelper.cpp', | |
'../../deps/icu/source/i18n/tmunit.cpp', | |
'../../deps/icu/source/i18n/tmutamt.cpp', | |
@@ -423,6 +416,7 @@ | |
'defines': [ | |
'U_COMMON_IMPLEMENTATION=1', | |
], | |
+ 'cflags_c': ['-std=c99'], | |
'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ], | |
'direct_dependent_settings': { | |
'include_dirs': [ | |
@@ -463,6 +457,7 @@ | |
'U_TOOLUTIL_IMPLEMENTATION=1', | |
#'DEBUG=0', # http://bugs.icu-project.org/trac/ticket/10977 | |
], | |
+ 'cflags_c': ['-std=c99'], | |
'direct_dependent_settings': { | |
'include_dirs': [ | |
'../../deps/icu/source/common', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Should be able to skip udbgutil for node (although it is a good catch)
C99 ought to work everywhere or else could be
if smartos
…The __sun patch is also good for upstream.
Could also probably define
__XOPEN_SOURCE_EXTENDED=0
to avoid a source patch?