Skip to content

Commit 252c2f3

Browse files
committed
Merge branch 'rightlib' into merge-libs-250305-0050
2 parents fb4d6bb + 79e01d6 commit 252c2f3

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

build/conf/bison_lex.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Thus uses _ADD_HIDDEN_INPUTS() macro from ymake.core.conf
55

66
M4_PATH=contrib/tools/m4
7+
M4_BINARY=${tool:M4_PATH}
78

89
LEX_FLAGS=
910
BISON_FLAGS=-v

build/conf/settings.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ when ($AUTOCHECK == "yes") {
1919
PIC_NO_PIE=yes
2020
}
2121

22+
when ($OS_LINUX == "yes") {
23+
YMAKE_USE_OBJCOPY=yes
24+
}
25+
2226
# NOTE! Only foldable vars should be listed here
2327
_FOLDABLE_VARS=\
2428
CL_WRAPPER \

build/scripts/gen_yql_python_udf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
LIBRA_MODULE(TLibraModule, "Libra@MODULE_NAME@");
1818
#endif
1919
20-
extern "C" UDF_API void Register(IRegistrator& registrator, ui32 flags) {
20+
extern "C" YQL_UDF_API void Register(IRegistrator& registrator, ui32 flags) {
2121
RegisterYqlPythonUdf(registrator, flags, TStringBuf("@MODULE_NAME@"), TStringBuf("@PACKAGE_NAME@"), EPythonFlavor::@FLAVOR@);
2222
#if @WITH_LIBRA@
2323
RegisterHelper<TLibraModule>(registrator);
2424
#endif
2525
}
2626
27-
extern "C" UDF_API ui32 AbiVersion() {
27+
extern "C" YQL_UDF_API ui32 AbiVersion() {
2828
return CurrentAbiVersion();
2929
}
3030
31-
extern "C" UDF_API void SetBackTraceCallback(TBackTraceCallback callback) {
31+
extern "C" YQL_UDF_API void SetBackTraceCallback(TBackTraceCallback callback) {
3232
SetBackTraceCallbackImpl(callback);
3333
}
3434

build/ymake.core.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2268,12 +2268,14 @@ macro DYNAMIC_DEPS(Path...) {
22682268
### for seamless testing and packaging
22692269
multimodule DYNAMIC_LIBRARY {
22702270
module DLL_BIN: DLL {
2271+
.SEM=_CPP_DYN_LIBRARY_SEM
22712272
.PROXY=yes
22722273
.IGNORED=PROVIDES
22732274
SET(MODULE_TAG DLL)
22742275
}
22752276
module DLL_LIB: _DLL_COMPATIBLE_LIBRARY {
22762277
.CMD=$TOUCH_UNIT_MF
2278+
.SEM=_SEM_IGNORED
22772279
.PEERDIRSELF=DLL_BIN
22782280
.IGNORED=SRCS PEERDIR RUN_PROGRAM PYTHON DYNAMIC_LIBRARY_FROM GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER USE_PYTHON2 USE_PYTHON3
22792281
.ALLOWED=DYNAMIC_DEPS
@@ -5906,7 +5908,3 @@ macro GENERATE_IMPLIB(Lib, Path, SONAME="") {
59065908

59075909
LINK_EXCLUDE_LIBRARIES($Lib)
59085910
}
5909-
5910-
when ($OS_LINUX == "yes") {
5911-
YMAKE_USE_OBJCOPY=yes
5912-
}

library/cpp/tld/tlds-alpha-by-domain.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version 2025030100, Last Updated Sat Mar 1 07:07:02 2025 UTC
1+
# Version 2025030400, Last Updated Tue Mar 4 07:07:01 2025 UTC
22
AAA
33
AARP
44
ABB

yql/essentials/public/udf/udf_registrator.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313

1414
#ifdef _win_
1515
# ifdef BUILD_UDF
16-
# define UDF_API __declspec(dllexport)
16+
# define YQL_UDF_API __declspec(dllexport)
1717
# else
18-
# define UDF_API __declspec(dllimport)
18+
# define YQL_UDF_API __declspec(dllimport)
1919
# endif
2020
#else
21-
# define UDF_API __attribute__ ((visibility("default")))
21+
# define YQL_UDF_API __attribute__ ((visibility("default")))
2222
#endif
2323

2424
#ifdef BUILD_UDF
2525
#define REGISTER_MODULES(...) \
26-
extern "C" UDF_API void Register( \
26+
extern "C" YQL_UDF_API void Register( \
2727
::NYql::NUdf::IRegistrator& registrator, ui32 flags) { \
2828
Y_UNUSED(flags); \
2929
::NYql::NUdf::RegisterHelper<__VA_ARGS__>(registrator); \
3030
} \
31-
extern "C" UDF_API ui32 AbiVersion() { \
31+
extern "C" YQL_UDF_API ui32 AbiVersion() { \
3232
return ::NYql::NUdf::CurrentAbiVersion(); \
3333
}\
34-
extern "C" UDF_API void SetBackTraceCallback(::NYql::NUdf::TBackTraceCallback callback) { \
34+
extern "C" YQL_UDF_API void SetBackTraceCallback(::NYql::NUdf::TBackTraceCallback callback) { \
3535
::NYql::NUdf::SetBackTraceCallbackImpl(callback); \
3636
}
3737
#else
@@ -204,12 +204,12 @@ static inline void AddToStaticUdfRegistry() {
204204
} // namspace NUdf
205205
} // namspace NYql
206206

207-
extern "C" UDF_API void Register(NYql::NUdf::IRegistrator& registrator, ui32 flags);
208-
extern "C" UDF_API ui32 AbiVersion();
207+
extern "C" YQL_UDF_API void Register(NYql::NUdf::IRegistrator& registrator, ui32 flags);
208+
extern "C" YQL_UDF_API ui32 AbiVersion();
209209
#if defined(_win_) || defined(_darwin_)
210-
extern "C" UDF_API void BindSymbols(const NYql::NUdf::TStaticSymbols& symbols);
210+
extern "C" YQL_UDF_API void BindSymbols(const NYql::NUdf::TStaticSymbols& symbols);
211211
#endif
212-
extern "C" UDF_API void SetBackTraceCallback(NYql::NUdf::TBackTraceCallback callback);
212+
extern "C" YQL_UDF_API void SetBackTraceCallback(NYql::NUdf::TBackTraceCallback callback);
213213

214214
namespace NYql {
215215
namespace NUdf {

0 commit comments

Comments
 (0)