projects / packages / Firebird.git / blame
| Commit | Line | Data |
|---|---|---|
| 8f47d69b AM |
1 | Description: Link isql with ICU instead of embedding part of it in the source |
| 2 | Author: Damyan Ivanov <dmn@debian.org> | |
| 3 | ||
| 4 | --- a/src/isql/isql.epp | |
| 5 | +++ b/src/isql/isql.epp | |
| 6 | @@ -173,34 +173,6 @@ const char* UNKNOWN = "*unknown*"; | |
| 7 | ||
| 8 | namespace IcuUtil | |
| 9 | { | |
| 10 | - // Duplicate from ICU to not need to link ISQL with it. It's used by U8_NEXT_UNSAFE. | |
| 11 | - static const uint8_t utf8_countTrailBytes[256] = { | |
| 12 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 13 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 14 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 15 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 16 | - | |
| 17 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 18 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 19 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 20 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 21 | - | |
| 22 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 23 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 24 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 25 | - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
| 26 | - | |
| 27 | - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
| 28 | - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
| 29 | - | |
| 30 | - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, | |
| 31 | - 3, 3, 3, 3, 3, | |
| 32 | - 3, 3, 3, /* illegal in Unicode */ | |
| 33 | - 4, 4, 4, 4, /* illegal in Unicode */ | |
| 34 | - 5, 5, /* illegal in Unicode */ | |
| 35 | - 0, 0 /* illegal bytes 0xfe and 0xff */ | |
| 36 | - }; | |
| 37 | - | |
| 38 | // Return the number of characters of a string. | |
| 39 | static unsigned charLength(SSHORT charset, unsigned len, const char* str) | |
| 40 | { | |
| 41 | --- a/builds/posix/Makefile.in | |
| 42 | +++ b/builds/posix/Makefile.in | |
| 43 | @@ -454,7 +454,8 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB | |
| 44 | isql: $(ISQL) | |
| 45 | ||
| 46 | $(ISQL): $(ISQL_Objects) $(COMMON_LIB) | |
| 47 | - $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) | |
| 48 | + $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) \ | |
| 49 | + $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS) | |
| 50 | ||
| 51 | nbackup: $(NBACKUP) | |
| 52 |