1 files changed, 16 insertions, 22 deletions
diff --git a/libicuuc/libicu/buildfile b/libicuuc/libicu/buildfile
index e5c451f..63a6287 100644
--- a/libicuuc/libicu/buildfile
+++ b/libicuuc/libicu/buildfile
@@ -3,9 +3,15 @@
 
 ./: lib{icuuc} lib{icudata}
 
-patched = ucasemap unistr uniset
+patched = putil ucasemap uniset unistr
 
-lib{icuuc}: uc/hxx{**} uc/cxx{* -{$patched}} cxx{$patched} lib{icudata}
+# Note that some of the uc/unicode/*.h files are C++ headers and some are C
+# headers. We will assume all of them as C headers, which is a bit of a hack
+# but doing it properly is too painful.
+#
+lib{icuuc}: uc/hxx{** -unicode/*} uc/unicode/h{*} \
+            uc/cxx{* -{$patched}} cxx{$patched}   \
+            lib{icudata}
 
 lib{icudata}: data/{h c}{*} uc/unicode/h{*}
 
@@ -21,6 +27,9 @@ windows = ($tclass == 'windows')
 
 # Build options.
 #
+# Note that we build without plugins support (UCONFIG_ENABLE_PLUGINS macro is
+# undefined) and thus we don't define the DEFAULT_ICU_PLUGINS macro either.
+#
 cc.poptions  += -DU_ATTRIBUTE_DEPRECATED=
 cxx.poptions += -DU_COMMON_IMPLEMENTATION
 
@@ -65,11 +74,11 @@ cc.poptions =+ "-I$src_root" "-I$src_base/uc"
 
 obja{*}: cc.poptions += -DU_STATIC_IMPLEMENTATION
 
-switch $c.class, $tsys
+switch $c.class
 {
   case 'gcc'
   {
-    cc.coptions  += -fvisibility=hidden
+    cc.coptions += -fvisibility=hidden
 
     # Disable warnings that pop up with -Wall -Wextra. Upstream doesn't seem
     # to care about these and it is not easy to disable specific warnings in a
@@ -97,21 +106,6 @@ switch $c.class, $tsys
   }
 }
 
-# If install.root is specified, then define the DEFAULT_ICU_PLUGINS macro when
-# compiling uc/icuplug.cpp and leave it undefined otherwise.
-#
-if ($install.root != [null])
-{
-  plugins_dir = $install.resolve($install.lib)/icu
-
-  # Escape backslashes and quotes in the directory path prior to representing
-  # it as C++ string literal.
-  #
-  pd = $regex.replace($plugins_dir, '(\\|")', '\\\1')
-
-  uc/obj{icuplug}: cxx.poptions += -DDEFAULT_ICU_PLUGINS="\"$pd\""
-}
-
 switch $tclass, $tsys
 {
   case 'linux'
@@ -167,6 +161,6 @@ else
 
 # Install headers from the uc/unicode/ subdirectory only.
 #
-h{*}:              install = false
-hxx{*}:            install = false
-uc/unicode/hxx{*}: install = include/unicode/
+h{*}:            install = false
+hxx{*}:          install = false
+uc/unicode/h{*}: install = include/unicode/