diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2023-05-12 19:36:29 +0000 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2023-05-12 19:36:29 +0000 |
commit | e9aadad8effd412e4f211caedb96e3f1b8e0d64e (patch) | |
tree | ff30638b099bacf0afc800144053675286091e3e | |
parent | ddc3cb203fe336bb6f44ae70e6d629327599a172 (diff) | |
parent | 63ea8f1a2a603c356ad770ae7567246e7520f298 (diff) | |
download | tracker-e9aadad8effd412e4f211caedb96e3f1b8e0d64e.tar.gz |
Merge branch 'wip/carlosg/strftime-format-detection' into 'master'
build: Detect appropriate strftime() year modifier at build time
Closes #402
See merge request https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/593
-rw-r--r-- | config.h.meson.in | 3 | ||||
-rw-r--r-- | meson.build | 35 | ||||
-rw-r--r-- | src/libtracker-sparql/core/tracker-db-interface-sqlite.c | 4 |
3 files changed, 40 insertions, 2 deletions
diff --git a/config.h.meson.in b/config.h.meson.in index df4b880b0..2faa1a586 100644 --- a/config.h.meson.in +++ b/config.h.meson.in @@ -51,3 +51,6 @@ /* Whether RTLD_NOLOAD is defined */ #mesondefine HAVE_RTLD_NOLOAD + +/* Appropriate 4-digit year modifier for strftime() */ +#mesondefine STRFTIME_YEAR_MODIFIER diff --git a/meson.build b/meson.build index 3c147c8f3..6a7f8e133 100644 --- a/meson.build +++ b/meson.build @@ -199,6 +199,39 @@ else endif ################################################################## +# Get an appropriate 4-digit year modifier for strftime +################################################################## +result = cc.run(''' + #include <stdio.h> + #include <string.h> + #include <time.h> + + int main (int argc, char *argv[]) { + char *modifiers[] = { "%Y", "%C%y", "%4Y", "%2C%y", NULL }; + time_t timestamp = -58979923200; /* 0101-01-01T01:01:01Z */ + char *buf[100]; + struct tm tm; + int i; + gmtime_r (×tamp, &tm); + for (i = 0; modifiers[i]; i++) { + strftime (&buf, sizeof buf, modifiers[i], &tm); + if (strcmp (&buf, "0101") == 0) { + printf ("%s", modifiers[i]); + return 0; + } + } + return -1; + } + ''', + name: 'strftime 4-digit year modifier') + +if not result.compiled() or result.returncode() != 0 + error('Libc implementation has broken 4-digit years implementation.') +else + year_modifier = result.stdout() +endif + +################################################################## # Check for libtracker-data and libtracker-fts: Unicode support # # By default, AUTO with this order of preference: @@ -306,6 +339,7 @@ conf.set('TRACKER_MINOR_VERSION', tracker_minor_version) conf.set('TRACKER_MICRO_VERSION', tracker_micro_version) conf.set('TRACKER_INTERFACE_AGE', 0) conf.set('TRACKER_BINARY_AGE', 100 * tracker_minor_version + tracker_micro_version) +conf.set('STRFTIME_YEAR_MODIFIER', '"@0@"'.format(year_modifier)) # Check for RTLD_NOLOAD have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD') @@ -399,6 +433,7 @@ summary = [ ' Debug: ' + get_option('debug').to_string(), ' Optimization: ' + get_option('optimization'), ' Compiler: ' + cc.get_id(), + ' 4-digit strftime() year modifier: ' + year_modifier, '\nFeature Support:', ' Unicode support library: ' + unicode_library_name, ' Build with Stemming support: ' + have_libstemmer.to_string(), diff --git a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c index 6b3482435..51d54368f 100644 --- a/src/libtracker-sparql/core/tracker-db-interface-sqlite.c +++ b/src/libtracker-sparql/core/tracker-db-interface-sqlite.c @@ -1624,9 +1624,9 @@ function_sparql_print_value (sqlite3_context *context, result_context_function_error (context, fn, "Invalid unix timestamp"); if (prop_type == TRACKER_PROPERTY_TYPE_DATETIME) - retval = strftime ((gchar *) &buf, sizeof (buf), "%2C%y-%m-%dT%TZ", &tm); + retval = strftime ((gchar *) &buf, sizeof (buf), STRFTIME_YEAR_MODIFIER "-%m-%dT%TZ", &tm); else if (prop_type == TRACKER_PROPERTY_TYPE_DATE) - retval = strftime ((gchar *) &buf, sizeof (buf), "%2C%y-%m-%d", &tm); + retval = strftime ((gchar *) &buf, sizeof (buf), STRFTIME_YEAR_MODIFIER "-%m-%d", &tm); else g_assert_not_reached (); |