build: define TZDIR for tzcode build #7186
Merged
+4
−0
Conversation
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
nixos (and probably some other distributives) place zoneinfo directory not in /usr/share (in /etc for example). TZDIR is set accordingly. Currently zoneinfo is looked for in /usr/share, disregarding TZDIR env variable. This commit adds compile definition for TZDIR if such env variable is defined. This fixes zoneinfo lookup for nixos. NO_CHANGELOG=build NO_DOC=build NO_TEST=build
grafin
force-pushed
the
grafin/tzcode-tzdir
branch
from
60cc0df
to
c2ec986
Compare
ligurio
approved these changes
May 30, 2022
| @@ -13,6 +13,10 @@ set(TZDATA_FULL_TARGET ${TZCODE_SOURCE_DIR}/${TZDATA_TARGET}) | |||
| set(TZCODE_SRC ${PROJECT_SOURCE_DIR}/src/lib/tzcode) | |||
| set(TZLUA_SRC ${PROJECT_SOURCE_DIR}/src/lua) | |||
|
|
|||
| if(DEFINED ENV{TZDIR}) | |||
There was a problem hiding this comment.
We can evaluate ENV{TZDIR} only once and then use variable with value. I'll not insist, it's up to you.
kyukhin
approved these changes
Jun 2, 2022
|
Backported to 2.10 as well. |
CuriousGeorgiy
added a commit
to CuriousGeorgiy/tarantool
that referenced
this pull request
Jan 17, 2023
Both of the callbacks in the `print` wrapper are expected to be called, but
`print` may throw errors, e.g.,
`print(setmetatable({}, {__tostring = error})`, so we need to call it in a
protected environment and execute the 'after' callback even if `print`
throws.
Closes tarantool#8136
NO_CHANGELOG=<tarantoolgh-7186 was not released yet>
NO_DOC=bugfix
locker
pushed a commit
that referenced
this pull request
Jan 18, 2023
Both of the callbacks in the `print` wrapper are expected to be called, but
`print` may throw errors, e.g.,
`print(setmetatable({}, {__tostring = error})`, so we need to call it in a
protected environment and execute the 'after' callback even if `print`
throws.
Closes #8136
NO_CHANGELOG=<gh-7186 was not released yet>
NO_DOC=bugfix
Lord-KA
pushed a commit
to Lord-KA/tarantool
that referenced
this pull request
Feb 27, 2023
Both of the callbacks in the `print` wrapper are expected to be called, but
`print` may throw errors, e.g.,
`print(setmetatable({}, {__tostring = error})`, so we need to call it in a
protected environment and execute the 'after' callback even if `print`
throws.
Closes tarantool#8136
NO_CHANGELOG=<tarantoolgh-7186 was not released yet>
NO_DOC=bugfix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NixOS (and probably some other distributives) places
zoneinfodirectory not to/usr/share, but rather in directory of a form/nix/store/izida45xkdjkejekje8282hdhdh6q3-tzdata-2022a/share/zoneinfo/. In this case NixOS setsTZDIRenvironment variable accordingly. Currently, in Tarantool we hardcode/usr/share/zoneinfoas a location to use, disregardingTZDIRenv variable.This commit adds compile-time definition for
TZDIRif such env variable defined, which allows to fix zoneinfo lookup in case of NixOS.