[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin

[Andras Timar (via logerrit)]

 solenv/bin/modules/installer/splitdbg.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8be82816380492adf7ecc818de6bcc2c843cebe9
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Feb 4 12:20:52 2022 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Feb 4 12:20:52 2022 +0100

    [cp] better condition whether to split the debug info
    
    On my PC (openSUSE 15.3) I've got the following:
    file instdir/program/libmergedlo.so
    instdir/program/libmergedlo.so: ELF 64-bit LSB shared object, x86-64, 
version 1 (GNU/Linux), dynamically linked, 
BuildID[sha1]=40be1a5cb04f9910d471094a574feecac4c1f82b, with debug_info, not 
stripped
    On the centos7 build host, the debug info packages were not generated, 
because output of `file` command did not contain "with debug_info".
    file instdir/program/libmergedlo.so
    instdir/program/libmergedlo.so: ELF 64-bit LSB shared object, x86-64, 
version 1 (GNU/Linux), dynamically linked, 
BuildID[sha1]=f953b674501b28b3537269ab1b9312102ea5d6c1, not stripped
    
    Change-Id: I799b85499450c19e098223ad8633ad2da61c4ff8

diff --git a/solenv/bin/modules/installer/splitdbg.pm 
b/solenv/bin/modules/installer/splitdbg.pm
index cab93ee6386b..60c0c1bde024 100644
--- a/solenv/bin/modules/installer/splitdbg.pm
+++ b/solenv/bin/modules/installer/splitdbg.pm
@@ -33,7 +33,7 @@ sub _need_to_splitdbg
     my $fileoutput = <FILE>;
     close (FILE);
 
-    if (( $fileoutput =~ /with debug_info/i ) && ( $fileoutput =~ /\bELF\b/ )) 
{ $splitdbg = 1; }
+    if (( $fileoutput =~ /not stripped/i ) && ( $fileoutput =~ /\bELF\b/ )) { 
$splitdbg = 1; }
 
     return $splitdbg;
 }