Ignore:
Timestamp:
08/03/2021 03:45:09 AM (3 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib, xry111/multilib
Children:
31ff88b
Parents:
6ff520f (diff), adcaf07e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chapter08/strippingagain.xml

    r6ff520f r66bfc2b  
    4444
    4545<!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
    46 <screen><userinput>save_usrlib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so
    47              libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
    48              libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
     46      <screen><userinput>save_usrlib="ld-linux-x86-64.so.2
     47             libc.so.6
     48             libpthread.so.6
     49             libthread_db.so
     50             libquadmath.so.&libquadmath-version;
     51             libstdc++.so.6
     52             libitm.so.&libitm-version;
     53             libatomic.so.&libatomic-version;"
    4954
    5055cd /usr/lib
     
    7984
    8085online_usrbin="bash find strip"
    81 online_usrlib="libbfd-&binutils-version;.so libdl-&glibc-version;.so
    82                libhistory.so.&readline-version; libncursesw.so.&ncurses-version;
    83                libm-&glibc-version;.so libreadline.so.&readline-version;
    84                libz.so.&zlib-version;
     86online_usrlib="libbfd.so
     87               libdl.so.2
     88               libhistory.so
     89               libncursesw.so
     90               libm.so.6
     91               libreadline.so
     92               libz.so
    8593               $(cd /usr/lib; find libnss*.so* -type f)"
    8694
Note: See TracChangeset for help on using the changeset viewer.