Prepare for ICU update

- libicule and libiculx do not exist anymore in newer ICU versions
  (harfbuzz replaces them), but we didn't actually use them, so remove
  them from the build feature and from the package dependencies
- Add namespace usage marcos since the newer ICU packages put ICU things
  in a namespace, making it easier to have multiple versions of ICU used
  side by side.

No functional change intended, but this makes it possible to build the
code with either ICU 57 (for gcc2) or 66 (for other architectures).
This commit is contained in:
Adrien Destugues
2020-08-02 11:58:14 +02:00
parent b3aed2adb5
commit 1bad1ff34a
46 changed files with 142 additions and 52 deletions
+16 -2
View File
@@ -104,8 +104,22 @@ if [ IsPackageAvailable icu_devel ] {
$(developLibDir)/libicudata.so
$(developLibDir)/libicui18n.so
$(developLibDir)/libicuio.so
$(developLibDir)/libicule.so
$(developLibDir)/libiculx.so
$(developLibDir)/libicutu.so
$(developLibDir)/libicuuc.so
headers: $(developHeadersDir)
;
EnableBuildFeatures icu ;
} else if [ IsPackageAvailable icu66_devel ] {
ExtractBuildFeatureArchives icu :
file: base icu66
runtime: lib
file: devel icu66_devel
depends: base
libraries:
$(developLibDir)/libicudata.so
$(developLibDir)/libicui18n.so
$(developLibDir)/libicuio.so
$(developLibDir)/libicutu.so
$(developLibDir)/libicuuc.so
headers: $(developHeadersDir)