diff options
author | somov <somov@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:49 +0300 |
commit | 7489e4682331202b9c7d863c0898eb83d7b12c2b (patch) | |
tree | 9142afc54d335ea52910662635b898e79e192e49 /build/platform/perl | |
parent | a5950576e397b1909261050b8c7da16db58f10b1 (diff) | |
download | ydb-7489e4682331202b9c7d863c0898eb83d7b12c2b.tar.gz |
Restoring authorship annotation for <somov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/platform/perl')
-rw-r--r-- | build/platform/perl/5.14/ya.make | 22 | ||||
-rw-r--r-- | build/platform/perl/5.18/ya.make | 22 | ||||
-rw-r--r-- | build/platform/perl/5.22/ya.make | 22 | ||||
-rw-r--r-- | build/platform/perl/5.26/ya.make | 22 | ||||
-rw-r--r-- | build/platform/perl/5.30/ya.make | 22 | ||||
-rw-r--r-- | build/platform/perl/perl.inc | 66 | ||||
-rw-r--r-- | build/platform/perl/perl_5.18.patch | 102 | ||||
-rw-r--r-- | build/platform/perl/ya.make | 32 |
8 files changed, 155 insertions, 155 deletions
diff --git a/build/platform/perl/5.14/ya.make b/build/platform/perl/5.14/ya.make index 28a1734640..3db5747945 100644 --- a/build/platform/perl/5.14/ya.make +++ b/build/platform/perl/5.14/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-12) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-12) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.18/ya.make b/build/platform/perl/5.18/ya.make index ae293b04d3..1d17311066 100644 --- a/build/platform/perl/5.18/ya.make +++ b/build/platform/perl/5.18/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-14) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-14) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.22/ya.make b/build/platform/perl/5.22/ya.make index 0a1ce79d9e..658bcc2552 100644 --- a/build/platform/perl/5.22/ya.make +++ b/build/platform/perl/5.22/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-16) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-16) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.26/ya.make b/build/platform/perl/5.26/ya.make index c481dce711..c510f6091a 100644 --- a/build/platform/perl/5.26/ya.make +++ b/build/platform/perl/5.26/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-18) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-18) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/5.30/ya.make b/build/platform/perl/5.30/ya.make index 199464caa4..ba0132c6ba 100644 --- a/build/platform/perl/5.30/ya.make +++ b/build/platform/perl/5.30/ya.make @@ -1,11 +1,11 @@ -RESOURCES_LIBRARY() - -OWNER(somov) - -SET(PERL_SDK ubuntu-20) - -SRCDIR(build/platform/perl) - -INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) - -END() +RESOURCES_LIBRARY() + +OWNER(somov) + +SET(PERL_SDK ubuntu-20) + +SRCDIR(build/platform/perl) + +INCLUDE(${ARCADIA_ROOT}/build/platform/perl/perl.inc) + +END() diff --git a/build/platform/perl/perl.inc b/build/platform/perl/perl.inc index 840a19989b..139e65bb33 100644 --- a/build/platform/perl/perl.inc +++ b/build/platform/perl/perl.inc @@ -1,33 +1,33 @@ -PROVIDES(system_perl) - -IF (PERL_SDK == "ubuntu-12") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_514 sbr:337748278) -ELSEIF (PERL_SDK == "ubuntu-14") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_518 sbr:1655582861) -ELSEIF (PERL_SDK == "ubuntu-16") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_522 sbr:323251590) -ELSEIF (PERL_SDK == "ubuntu-18") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_526 sbr:616700320) -ELSEIF (PERL_SDK == "ubuntu-20") - DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_530 sbr:2001114055) -ELSE() - MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") -ENDIF() - -IF (PERL_INCLUDE) - CFLAGS(GLOBAL $PERL_INCLUDE) -ENDIF() - -CFLAGS(GLOBAL -I$PERL_ARCHLIB/CORE) - -IF (PERL_LIBS) - LDFLAGS(-L${PERL_LIBS}) -ENDIF() - -IF (NOT OS_WINDOWS) - LDFLAGS(-lperl) -ELSE() - LDFLAGS(perl.lib) -ENDIF() - -CFLAGS(GLOBAL -DUSE_PERL) +PROVIDES(system_perl) + +IF (PERL_SDK == "ubuntu-12") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_514 sbr:337748278) +ELSEIF (PERL_SDK == "ubuntu-14") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_518 sbr:1655582861) +ELSEIF (PERL_SDK == "ubuntu-16") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_522 sbr:323251590) +ELSEIF (PERL_SDK == "ubuntu-18") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_526 sbr:616700320) +ELSEIF (PERL_SDK == "ubuntu-20") + DECLARE_EXTERNAL_RESOURCE(SYSTEM_PERL_530 sbr:2001114055) +ELSE() + MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") +ENDIF() + +IF (PERL_INCLUDE) + CFLAGS(GLOBAL $PERL_INCLUDE) +ENDIF() + +CFLAGS(GLOBAL -I$PERL_ARCHLIB/CORE) + +IF (PERL_LIBS) + LDFLAGS(-L${PERL_LIBS}) +ENDIF() + +IF (NOT OS_WINDOWS) + LDFLAGS(-lperl) +ELSE() + LDFLAGS(perl.lib) +ENDIF() + +CFLAGS(GLOBAL -DUSE_PERL) diff --git a/build/platform/perl/perl_5.18.patch b/build/platform/perl/perl_5.18.patch index ba350db058..840227eb54 100644 --- a/build/platform/perl/perl_5.18.patch +++ b/build/platform/perl/perl_5.18.patch @@ -1,51 +1,51 @@ -diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/pad.h b/perl5.18/lib/perl/5.18/CORE/pad.h ---- a/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 09:58:43.970483379 +0300 -+++ b/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 10:00:56.850097798 +0300 -@@ -320,7 +320,7 @@ - PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ - PL_curpad = AvARRAY(PL_comppad); \ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ -- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ -+ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ - PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); - - -@@ -338,7 +338,7 @@ - PL_comppad = (npad); \ - PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ -- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ -+ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ - PTR2UV(PL_comppad), PTR2UV(PL_curpad))); - - #define PAD_RESTORE_LOCAL(opad) \ -@@ -346,7 +346,7 @@ - PL_comppad = opad; \ - PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ - DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ -- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ -+ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ - PTR2UV(PL_comppad), PTR2UV(PL_curpad))); - - -diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/perl.h b/perl5.18/lib/perl/5.18/CORE/perl.h ---- a/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 09:58:43.966483390 +0300 -+++ b/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 10:01:44.649957846 +0300 -@@ -4254,7 +4254,7 @@ - EXTCONST char PL_warn_uninit[] - INIT("Use of uninitialized value%s%s%s"); - EXTCONST char PL_warn_uninit_sv[] -- INIT("Use of uninitialized value%"SVf"%s%s"); -+ INIT("Use of uninitialized value%" SVf "%s%s"); - EXTCONST char PL_warn_nosemi[] - INIT("Semicolon seems to be missing"); - EXTCONST char PL_warn_reserved[] -@@ -4274,7 +4274,7 @@ - EXTCONST char PL_no_aelem[] - INIT("Modification of non-creatable array value attempted, subscript %d"); - EXTCONST char PL_no_helem_sv[] -- INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\""); -+ INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\""); - EXTCONST char PL_no_modify[] - INIT("Modification of a read-only value attempted"); - EXTCONST char PL_no_mem[sizeof("Out of memory!\n")] +diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/pad.h b/perl5.18/lib/perl/5.18/CORE/pad.h +--- a/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 09:58:43.970483379 +0300 ++++ b/perl5.18/lib/perl/5.18/CORE/pad.h 2020-08-10 10:00:56.850097798 +0300 +@@ -320,7 +320,7 @@ + PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ + PL_curpad = AvARRAY(PL_comppad); \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); + + +@@ -338,7 +338,7 @@ + PL_comppad = (npad); \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + #define PAD_RESTORE_LOCAL(opad) \ +@@ -346,7 +346,7 @@ + PL_comppad = opad; \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + +diff --unified --recursive a/perl5.18/lib/perl/5.18/CORE/perl.h b/perl5.18/lib/perl/5.18/CORE/perl.h +--- a/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 09:58:43.966483390 +0300 ++++ b/perl5.18/lib/perl/5.18/CORE/perl.h 2020-08-10 10:01:44.649957846 +0300 +@@ -4254,7 +4254,7 @@ + EXTCONST char PL_warn_uninit[] + INIT("Use of uninitialized value%s%s%s"); + EXTCONST char PL_warn_uninit_sv[] +- INIT("Use of uninitialized value%"SVf"%s%s"); ++ INIT("Use of uninitialized value%" SVf "%s%s"); + EXTCONST char PL_warn_nosemi[] + INIT("Semicolon seems to be missing"); + EXTCONST char PL_warn_reserved[] +@@ -4274,7 +4274,7 @@ + EXTCONST char PL_no_aelem[] + INIT("Modification of non-creatable array value attempted, subscript %d"); + EXTCONST char PL_no_helem_sv[] +- INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\""); ++ INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\""); + EXTCONST char PL_no_modify[] + INIT("Modification of a read-only value attempted"); + EXTCONST char PL_no_mem[sizeof("Out of memory!\n")] diff --git a/build/platform/perl/ya.make b/build/platform/perl/ya.make index cb7a4ee075..cc50c05c26 100644 --- a/build/platform/perl/ya.make +++ b/build/platform/perl/ya.make @@ -1,24 +1,24 @@ -LIBRARY() +LIBRARY() OWNER(somov) -NO_PLATFORM() - +NO_PLATFORM() + IF (USE_PERL_SYSTEM) - IF (PERL_SDK == "ubuntu-12") - PEERDIR(build/platform/perl/5.14) - ELSEIF (PERL_SDK == "ubuntu-14") - PEERDIR(build/platform/perl/5.18) - ELSEIF (PERL_SDK == "ubuntu-16") - PEERDIR(build/platform/perl/5.22) - ELSEIF (PERL_SDK == "ubuntu-18") - PEERDIR(build/platform/perl/5.26) - ELSEIF (PERL_SDK == "ubuntu-20") - PEERDIR(build/platform/perl/5.30) + IF (PERL_SDK == "ubuntu-12") + PEERDIR(build/platform/perl/5.14) + ELSEIF (PERL_SDK == "ubuntu-14") + PEERDIR(build/platform/perl/5.18) + ELSEIF (PERL_SDK == "ubuntu-16") + PEERDIR(build/platform/perl/5.22) + ELSEIF (PERL_SDK == "ubuntu-18") + PEERDIR(build/platform/perl/5.26) + ELSEIF (PERL_SDK == "ubuntu-20") + PEERDIR(build/platform/perl/5.30) ELSE() - MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") - ENDIF() - + MESSAGE(FATAL_ERROR "Building against system perl is not supported on ${PERL_SDK}") + ENDIF() + ELSE() MESSAGE(FATAL_ERROR "There is no perl ready for static linkage. Try using the system one.") |