Changeset 0ebda11


Ignore:
Timestamp:
05/14/2021 10:47:43 AM (7 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
ml-11.0, multilib
Children:
2606939
Parents:
51c01bff
Message:

Remove entities for multilib pathes
Add usage of libc_cv_rtlddir

Files:
33 edited

Legend:

Unmodified
Added
Removed
  • chapter04/addinguser.xml

    r51c01bff r0ebda11  
    8585  x86_64) chown -v lfs $LFS/lib64 ;;
    8686esac</userinput></screen>
    87 <screen arch="ml_32"  ><userinput>chown -v lfs $LFS&lib-m32;</userinput></screen>
    88 <screen arch="ml_x32" ><userinput>chown -v lfs $LFS&lib-mx32;</userinput></screen>
     87<screen arch="ml_32"  ><userinput>chown -v lfs $LFS/lib32</userinput></screen>
     88<screen arch="ml_x32" ><userinput>chown -v lfs $LFS/libx32</userinput></screen>
    8989<screen arch="ml_all" ><userinput>chown -v lfs $LFS/{lib32,libx32}</userinput></screen>
    9090
  • chapter04/creatingminlayout.xml

    r51c01bff r0ebda11  
    3030  x86_64) mkdir -pv $LFS/lib64 ;;
    3131esac</userinput></screen>
    32 <screen arch="ml_32"><userinput>mkdir -pv $LFS&usr-lib-m32;
    33 ln -sv usr&lib-m32; $LFS&lib-m32;</userinput></screen>
    34 <screen arch="ml_x32"><userinput>mkdir -pv $LFS&usr-lib-mx32;
    35 ln -sv usr&lib-mx32; $LFS&lib-mx32;</userinput></screen>
     32<screen arch="ml_32"><userinput>mkdir -pv $LFS/usr/lib32
     33ln -sv usr/lib32 $LFS/lib32</userinput></screen>
     34<screen arch="ml_x32"><userinput>mkdir -pv $LFS/usr/libx32
     35ln -sv usr/libx32 $LFS/libx32</userinput></screen>
    3636<screen arch="ml_all"><userinput>mkdir -pv $LFS/usr/lib{,x}32
    37 ln -sv usr&lib-m32; $LFS&lib-m32;
    38 ln -sv usr&lib-mx32; $LFS&lib-mx32;</userinput></screen>
     37ln -sv usr/lib32 $LFS/lib32
     38ln -sv usr/libx32 $LFS/libx32</userinput></screen>
    3939
    4040    <note>
  • chapter05/gcc-pass1.xml

    r51c01bff r0ebda11  
    7979
    8080<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    81     -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
     81    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
    8282    -i.orig gcc/config/i386/t-linux64
    8383</userinput></screen>
  • chapter05/glibc.xml

    r51c01bff r0ebda11  
    8484      --enable-kernel=&min-kernel;                \
    8585      --with-headers=$LFS/usr/include    \
    86       libc_cv_slibdir=/usr/lib</userinput></screen>
     86      libc_cv_slibdir=/usr/lib           \
     87      libc_cv_rtlddir=/usr/lib</userinput></screen>
    8788<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                             \
    8889      --prefix=/usr                      \
     
    9293      --with-headers=$LFS/usr/include    \
    9394      --enable-multi-arch                \
    94       libc_cv_slibdir=/usr/lib</userinput></screen>
     95      libc_cv_slibdir=/usr/lib           \
     96      libc_cv_rtlddir=/usr/lib</userinput></screen>
    9597
    9698    <variablelist>
     
    130132          <para>This ensures that the library is installed in /usr/lib instead
    131133          of the default /lib64 on 64 bit machines.</para>
     134        </listitem>
     135      </varlistentry>
     136
     137      <varlistentry>
     138        <term><parameter>libc_cv_rtlddir=/usr/lib</parameter></term>
     139        <listitem>
     140          <para>Fix hardcoded path to the executable loader in the
     141            <command>ldd</command> script.</para>
    132142        </listitem>
    133143      </varlistentry>
     
    197207    </variablelist>
    198208
     209    <!--
     210      The /usr which gets removed from the RTLDLIST by the sed
     211      below is set by the libc_cv_rtlddir=/usr/lib above. When
     212      changing the libc_cv_rtlddir to /lib, the content of the
     213      ldd script does not need to be patched, but some other
     214      symlinks created by glibc itself will be not that correct
     215      and needs to be fixed by other symlinks.
     216
     217      First setting /usr and than removing /usr seems strange,
     218      but it looks like that libc_cv_rtlddir has more effect than
     219      only the pathes in ldd (it has influence on which symlinks
     220      to the loader are created where) and makes the handling
     221      in a multilib environment much easier.
     222      To me, it feels better to go the way with adding/removing
     223      /usr than to introduce a symlink hell.
     224     
     225      Another option to get ldd working properly is to set a
     226      symlink as "ln -svf lib /usr/lib64" but it has been reported
     227      that we used that already years ago but dropped it since
     228      libtool will complain sometimes with "library has been moved"
     229      warnings.
     230      Don't know if this is still the case - if not, this one
     231      symlink seems to be the cleanest way and the sed on ldd will
     232      be obsolete.
     233    -->
     234    <para>Fix hardcoded path to the executable loader in
     235    <command>ldd</command> script:</para>
     236
     237<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i $LFS/usr/bin/ldd</userinput></screen>
     238
    199239    <caution>
    200240      <para>At this point, it is imperative to stop and ensure that the basic
     
    246286
    247287    <para>Now recompile for m32. The extracted source can be
    248     reused but needs to cleaned before installing the m32
     288    reused but needs to be cleaned before installing the m32
    249289    version of Glibc.</para>
    250290
     
    266306      --with-headers=$LFS/usr/include    \
    267307      --enable-multi-arch                \
    268       --libdir=&usr-lib-m32;                \
    269       --libexecdir=&usr-lib-m32;            \
    270       libc_cv_slibdir=&usr-lib-m32;</userinput></screen>
     308      --libdir=/usr/lib32                \
     309      --libexecdir=/usr/lib32            \
     310      libc_cv_slibdir=/usr/lib32           \
     311      libc_cv_rtlddir=/usr/lib32</userinput></screen>
    271312
    272313    <para>Compile the package:</para>
     
    277318
    278319<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    279 cp -a DESTDIR&usr-lib-m32; $LFS/usr/
     320cp -a DESTDIR/usr/lib32 $LFS/usr/
    280321install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
    281322               $LFS/usr/include/gnu/
    282 ln -svf ..&lib-m32;/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen>
     323ln -svf ../lib32/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen>
     324
    283325
    284326    <caution>
     
    317359
    318360    <para>Now recompile for mx32. The extracted source can be
    319     reused but needs to cleaned before installing the mx32
     361    reused but needs to be cleaned before installing the mx32
    320362    version of Glibc.</para>
    321363
     
    337379      --with-headers=$LFS/usr/include    \
    338380      --enable-multi-arch                \
    339       --libdir=&usr-lib-mx32;               \
    340       --libexecdir=&usr-lib-mx32;           \
    341       libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
     381      --libdir=/usr/libx32               \
     382      --libexecdir=/usr/libx32           \
     383      libc_cv_slibdir=/usr/libx32           \
     384      libc_cv_rtlddir=/usr/libx32</userinput></screen>
    342385
    343386    <para>Compile the package:</para>
     
    348391
    349392<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    350 cp -a DESTDIR&usr-lib-mx32; $LFS/usr/
     393cp -a DESTDIR/usr/libx32 $LFS/usr/
    351394install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
    352395               $LFS/usr/include/gnu/
    353 ln -svf ..&lib-mx32;/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen>
     396ln -svf ../libx32/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen>
    354397
    355398    <caution>
  • chapter06/gcc-pass2.xml

    r51c01bff r0ebda11  
    7171
    7272<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    73     -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
     73    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
    7474    -i.orig gcc/config/i386/t-linux64</userinput></screen>
    7575<!--
  • chapter06/ncurses.xml

    r51c01bff r0ebda11  
    168168            --host=$LFS_TGT32       \
    169169            --build=$(./config.guess)    \
    170             --libdir=&usr-lib-m32;     \
     170            --libdir=/usr/lib32     \
    171171            --mandir=/usr/share/man \
    172172            --with-shared           \
     
    176176            --enable-pc-files       \
    177177            --enable-widec          \
    178             --with-pkg-config-libdir=&usr-lib-m32;/pkgconfig</userinput></screen>
     178            --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>
    179179
    180180    <para>Compile the package:</para>
     
    185185
    186186<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
    187 ln -s libncursesw.so DESTDIR&usr-lib-m32;/libcursesw.so
    188 cp -Rv DESTDIR&usr-lib-m32;/* $LFS&usr-lib-m32;
     187ln -s libncursesw.so DESTDIR/usr/lib32/libcursesw.so
     188cp -Rv DESTDIR/usr/lib32/* $LFS/usr/lib32
    189189rm -rf DESTDIR</userinput></screen>
    190190
     
    208208            --host=$LFS_TGTX32      \
    209209            --build=$(./config.guess)    \
    210             --libdir=&usr-lib-mx32;    \
     210            --libdir=/usr/libx32    \
    211211            --mandir=/usr/share/man \
    212212            --with-shared           \
     
    216216            --enable-pc-files       \
    217217            --enable-widec          \
    218             --with-pkg-config-libdir=&usr-lib-mx32;/pkgconfig</userinput></screen>
     218            --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen>
    219219
    220220    <para>Compile the package:</para>
     
    225225
    226226<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR TIC_PATH=$(pwd)/build/progs/tic install
    227 ln -s libncursesw.so DESTDIR&usr-lib-mx32;/libcursesw.so
    228 cp -Rv DESTDIR&usr-lib-mx32;/* $LFS&usr-lib-mx32;
     227ln -s libncursesw.so DESTDIR/usr/libx32/libcursesw.so
     228cp -Rv DESTDIR/usr/libx32/* $LFS/usr/libx32
    229229rm -rf DESTDIR</userinput></screen>
    230230
  • chapter07/changingowner.xml

    r51c01bff r0ebda11  
    4141  <para arch="ml_32,ml_x32,ml_all">Some more directories exists for
    4242  multilib support. Change their ownership, too:</para>
    43 <screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">chown -R root:root $LFS&lib-m32;</userinput>
    44 <userinput arch="ml_x32,ml_all">chown -R root:root $LFS&lib-mx32;</userinput></screen>
     43<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">chown -R root:root $LFS/lib32</userinput>
     44<userinput arch="ml_x32,ml_all">chown -R root:root $LFS/libx32</userinput></screen>
    4545 
    4646</sect1>
  • chapter07/util-linux.xml

    r51c01bff r0ebda11  
    152152            --disable-static     \
    153153            --without-python     \
    154             --libdir=&usr-lib-m32;      \
     154            --libdir=/usr/lib32      \
    155155            --host=i686-pc-linux-gnu</userinput></screen>
    156156
     
    162162
    163163<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    164 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     164cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    165165rm -rf DESTDIR</userinput></screen>
    166166
     
    192192            --disable-static     \
    193193            --without-python     \
    194             --libdir=&usr-lib-mx32; \
     194            --libdir=/usr/libx32 \
    195195            --host=x86_64-pc-linux-gnux32</userinput></screen>
    196196
     
    202202
    203203<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    204 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     204cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    205205rm -rf DESTDIR</userinput></screen>
    206206
  • chapter08/acl.xml

    r51c01bff r0ebda11  
    8181    --prefix=/usr         \
    8282    --disable-static      \
    83     --libdir=&usr-lib-m32;   \
    84     --libexecdir=&usr-lib-m32;   \
     83    --libdir=/usr/lib32   \
     84    --libexecdir=/usr/lib32   \
    8585    --host=i686-pc-linux-gnu</userinput></screen>
    8686
     
    9292
    9393<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    94 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     94cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    9595rm -rf DESTDIR</userinput></screen>
    9696
     
    113113    --prefix=/usr          \
    114114    --disable-static       \
    115     --libdir=&usr-lib-mx32;   \
    116     --libexecdir=&usr-lib-mx32;   \
     115    --libdir=/usr/libx32   \
     116    --libexecdir=/usr/libx32   \
    117117    --host=x86_64-pc-linux-gnux32</userinput></screen>
    118118
     
    124124
    125125<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    126 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     126cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    127127rm -rf DESTDIR</userinput></screen>
    128128
  • chapter08/attr.xml

    r51c01bff r0ebda11  
    8181    --prefix=/usr         \
    8282    --disable-static      \
    83     --libdir=&usr-lib-m32; \
     83    --libdir=/usr/lib32 \
    8484    --host=i686-pc-linux-gnu</userinput></screen>
    8585
     
    9191
    9292<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    93 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     93cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    9494rm -rf DESTDIR</userinput></screen>
    9595
     
    112112    --prefix=/usr          \
    113113    --disable-static       \
    114     --libdir=&usr-lib-mx32;   \
     114    --libdir=/usr/libx32   \
    115115    --host=x86_64-pc-linux-gnux32</userinput></screen>
    116116
     
    122122
    123123<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    124 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     124cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    125125rm -rf DESTDIR</userinput></screen>
    126126
  • chapter08/bzip2.xml

    r51c01bff r0ebda11  
    119119    <para>Install the package:</para>
    120120
    121 <screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1.0.8
    122 ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so
    123 ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1
    124 ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1.0
    125 install -Dm644 libbz2.a &usr-lib-m32;/libbz2.a</userinput></screen>
     121<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0.8
     122ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so
     123ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1
     124ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0
     125install -Dm644 libbz2.a /usr/lib32/libbz2.a</userinput></screen>
    126126
    127127  </sect2><!-- m32 -->
     
    146146    <para>Install the package:</para>
    147147
    148 <screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1.0.8
    149 ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so
    150 ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1
    151 ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1.0
    152 install -Dm644 libbz2.a &usr-lib-mx32;/libbz2.a</userinput></screen>
     148<screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0.8
     149ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so
     150ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1
     151ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0
     152install -Dm644 libbz2.a /usr/libx32/libbz2.a</userinput></screen>
    153153
    154154  </sect2><!-- mx32 -->
  • chapter08/eudev.xml

    r51c01bff r0ebda11  
    102102            --bindir=/sbin               \
    103103            --sbindir=/sbin              \
    104             --libdir=&usr-lib-m32;          \
     104            --libdir=/usr/lib32          \
    105105            --sysconfdir=/etc            \
    106             --libexecdir=&lib-m32;          \
     106            --libexecdir=/lib32          \
    107107            --with-rootprefix=           \
    108             --with-rootlibdir=&usr-lib-m32; \
     108            --with-rootlibdir=/usr/lib32 \
    109109            --disable-manpages           \
    110110            --disable-static             \
     
    118118
    119119<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    120 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     120cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    121121rm -rf DESTDIR</userinput></screen>
    122122
     
    140140            --bindir=/sbin               \
    141141            --sbindir=/sbin              \
    142             --libdir=&usr-lib-mx32;          \
     142            --libdir=/usr/libx32          \
    143143            --sysconfdir=/etc            \
    144             --libexecdir=&lib-mx32;         \
     144            --libexecdir=/libx32         \
    145145            --with-rootprefix=           \
    146             --with-rootlibdir=&usr-lib-mx32; \
     146            --with-rootlibdir=/usr/libx32 \
    147147            --disable-manpages           \
    148148            --disable-static             \
     
    156156
    157157<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    158 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     158cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    159159rm -rf DESTDIR</userinput></screen>
    160160
  • chapter08/expat.xml

    r51c01bff r0ebda11  
    8383<screen><userinput remap="configure">CC="gcc -m32" ./configure \
    8484    --prefix=/usr         \
    85     --libdir=&usr-lib-m32;  \
     85    --libdir=/usr/lib32  \
    8686    --host=i686-pc-linux-gnu</userinput></screen>
    8787
     
    9393
    9494<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    95 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     95cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    9696rm -rf DESTDIR</userinput></screen>
    9797
     
    115115<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    116116    --prefix=/usr         \
    117     --libdir=&usr-lib-mx32; \
     117    --libdir=/usr/libx32 \
    118118    --host=x86_64-pc-linux-gnux32</userinput></screen>
    119119
     
    125125
    126126<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    127 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     127cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    128128rm -rf DESTDIR</userinput></screen>
    129129
  • chapter08/file.xml

    r51c01bff r0ebda11  
    7575<screen><userinput remap="configure">CC="gcc -m32" ./configure \
    7676    --prefix=/usr         \
    77     --libdir=&usr-lib-m32;   \
     77    --libdir=/usr/lib32   \
    7878    --host=i686-pc-linux-gnu</userinput></screen>
    7979
     
    8585
    8686<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    87 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     87cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    8888rm -rf DESTDIR</userinput></screen>
    8989
     
    105105<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    106106    --prefix=/usr          \
    107     --libdir=&usr-lib-mx32;   \
     107    --libdir=/usr/libx32   \
    108108    --host=x86_64-pc-linux-gnux32</userinput></screen>
    109109
     
    115115
    116116<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    117 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     117cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    118118rm -rf DESTDIR</userinput></screen>
    119119
  • chapter08/gcc.xml

    r51c01bff r0ebda11  
    5656
    5757<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    58     -e '/m32=/s/m32=.*/m32=..\&lib-m32;$(call if_multiarch,:i386-linux-gnu)/' \
     58    -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
    5959    -i.orig gcc/config/i386/t-linux64</userinput></screen>
    6060
  • chapter08/glibc.xml

    r51c01bff r0ebda11  
    7373             --enable-stack-protector=strong          \
    7474             --with-headers=/usr/include              \
    75              libc_cv_slibdir=/usr/lib</userinput></screen>
     75             libc_cv_slibdir=/usr/lib                 \
     76             libc_cv_rtlddir=/usr/lib</userinput></screen>
    7677<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr                            \
    7778             --disable-werror                         \
     
    8081             --with-headers=/usr/include              \
    8182             --enable-multi-arch                      \
    82              libc_cv_slibdir=/usr/lib</userinput></screen>
     83             libc_cv_slibdir=/usr/lib                 \
     84             libc_cv_rtlddir=/usr/lib</userinput></screen>
    8385
    8486    <variablelist>
     
    125127          <para>This variable sets the correct library for all
    126128          systems.  We do not want lib64 to be used.</para>
     129        </listitem>
     130      </varlistentry>
     131
     132      <varlistentry>
     133        <term><parameter>libc_cv_rtlddir=/usr/lib</parameter></term>
     134        <listitem>
     135          <para>Fix hardcoded path to the executable loader in the
     136            <command>ldd</command> script.</para>
    127137        </listitem>
    128138      </varlistentry>
     
    222232
    223233<screen><userinput remap="install">make install</userinput></screen>
     234
     235    <para>Fix hardcoded path to the executable loader in
     236    <command>ldd</command> script:</para>
     237
     238<screen><userinput remap="install">sed '/RTLDLIST=/s@/usr@@g' -i /usr/bin/ldd</userinput></screen>
    224239
    225240    <para>Install the configuration file and runtime directory for
     
    483498
    484499    <para>Now recompile for m32. The extracted source can be
    485     reused but needs to cleaned before installing the m32
     500    reused but needs to be cleaned before installing the m32
    486501    version of Glibc.</para>
    487502
     
    502517      --with-headers=/usr/include        \
    503518      --enable-multi-arch                \
    504       --libdir=&usr-lib-m32;                \
    505       --libexecdir=&usr-lib-m32;            \
    506       libc_cv_slibdir=&usr-lib-m32;</userinput></screen>
     519      --libdir=/usr/lib32                \
     520      --libexecdir=/usr/lib32            \
     521      libc_cv_slibdir=/usr/lib32         \
     522      libc_cv_rtlddir=/usr/lib32</userinput></screen>
    507523
    508524    <para>Compile the package:</para>
     
    513529
    514530<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    515 cp -a DESTDIR&usr-lib-m32;/* &usr-lib-m32;/
     531cp -a DESTDIR/usr/lib32/* /usr/lib32/
    516532install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \
    517                /usr/include/gnu/
    518 ln -svf ..&lib-m32;/ld-linux.so.2 /lib/ld-linux.so.2</userinput></screen>
     533               /usr/include/gnu/</userinput></screen>
     534<!-- no longer required as they are created in chap5
     535ln -svf ../lib32/ld-linux.so.2 /lib/ld-linux.so.2
     536-->
    519537
    520538    <para>Add the library name to the dynamic loader config:</para>
    521539
    522 <screen role="install"><userinput>echo "&usr-lib-m32;" &gt;&gt; /etc/ld.so.conf</userinput></screen>
     540<screen role="install"><userinput>echo "/usr/lib32" &gt;&gt; /etc/ld.so.conf</userinput></screen>
    523541
    524542    <caution>
     
    557575
    558576    <para>Now recompile for mx32. The extracted source can be
    559     reused but needs to cleaned before installing the mx32
     577    reused but needs to be cleaned before installing the mx32
    560578    version of Glibc.</para>
    561579
     
    574592      --build=$(../scripts/config.guess) \
    575593      --enable-kernel=&min-kernel;                \
    576       --with-headers=$LFS/usr/include    \
     594      --with-headers=/usr/include        \
    577595      --enable-multi-arch                \
    578       --libdir=&usr-lib-mx32;               \
    579       --libexecdir=&usr-lib-mx32;           \
    580       libc_cv_slibdir=&usr-lib-mx32;</userinput></screen>
     596      --libdir=/usr/libx32               \
     597      --libexecdir=/usr/libx32           \
     598      libc_cv_slibdir=/usr/libx32         \
     599      libc_cv_rtlddir=/usr/libx32</userinput></screen>
    581600
    582601    <para>Compile the package:</para>
     
    587606
    588607<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    589 cp -a DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;/
     608cp -a DESTDIR/usr/libx32/* /usr/libx32/
    590609install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \
    591                /usr/include/gnu/
    592 ln -svf ..&lib-mx32;/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2</userinput></screen>
    593 
     610               /usr/include/gnu/</userinput></screen>
     611<!-- no longer required as they are created in chap5
     612ln -svf ../libx32/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2
     613-->
    594614    <para>Add the library name to the dynamic loader config:</para>
    595615
    596 <screen role="install"><userinput>echo "&usr-lib-mx32;" &gt;&gt; /etc/ld.so.conf</userinput></screen>
     616<screen role="install"><userinput>echo "/usr/libx32" &gt;&gt; /etc/ld.so.conf</userinput></screen>
    597617
    598618    <caution>
  • chapter08/gmp.xml

    r51c01bff r0ebda11  
    143143CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \
    144144CXXFLAGS="$CFLAGS" \
    145 PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
     145PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
    146146./configure             \
    147147    --prefix=/usr       \
    148148    --disable-static    \
    149149    --enable-cxx        \
    150     --libdir=&usr-lib-m32; \
    151     --includedir=&usr-inc-m32;/gmp</userinput></screen>
     150    --libdir=/usr/lib32 \
     151    --includedir=/usr/include/m32/gmp</userinput></screen>
    152152
    153153    <variablelist>
     
    155155
    156156      <varlistentry>
    157         <term><parameter>--includedir=&usr-inc-m32;/gmp</parameter></term>
     157        <term><parameter>--includedir=/usr/include/m32/gmp</parameter></term>
    158158        <listitem>
    159159          <para>Some definitions in gmp.h differs for each arch but
     
    187187
    188188<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    189 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
    190 cp -Rv DESTDIR&usr-inc-m32;/* &usr-inc-m32;/
     189cp -Rv DESTDIR/usr/lib32/* /usr/lib32
     190cp -Rv DESTDIR/usr/include/m32/* /usr/include/m32/
    191191rm -rf DESTDIR</userinput></screen>
    192192
     
    215215CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \
    216216CXXFLAGS="$CFLAGS" \
    217 PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
     217PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
    218218./configure              \
    219219    --prefix=/usr        \
    220220    --disable-static     \
    221221    --enable-cxx         \
    222     --libdir=&usr-lib-mx32; \
    223     --includedir=&usr-inc-mx32;/gmp</userinput></screen>
     222    --libdir=/usr/libx32 \
     223    --includedir=/usr/include/mx32/gmp</userinput></screen>
    224224
    225225    <para>Compile the package:</para>
     
    245245
    246246<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    247 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
    248 cp -Rv DESTDIR&usr-inc-mx32;/* &usr-inc-mx32;/
     247cp -Rv DESTDIR/usr/libx32/* /usr/libx32
     248cp -Rv DESTDIR/usr/include/mx32/* /usr/include/mx32/
    249249rm -rf DESTDIR</userinput></screen>
    250250
  • chapter08/kmod.xml

    r51c01bff r0ebda11  
    102102    --prefix=/usr                 \
    103103    --bindir=/bin                 \
    104     --libdir=&usr-lib-m32;          \
     104    --libdir=/usr/lib32          \
    105105    --sysconfdir=/etc             \
    106106    --with-xz                     \
    107107    --with-zlib                   \
    108108    --host=i686-pc-linux-gnu      \
    109     --with-rootlibdir=&usr-lib-m32;</userinput></screen>
     109    --with-rootlibdir=/usr/lib32</userinput></screen>
    110110
    111111    <para>Compile the package:</para>
     
    116116
    117117<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    118 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     118cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    119119rm -rf DESTDIR</userinput></screen>
    120120
     
    139139    --prefix=/usr                 \
    140140    --bindir=/bin                 \
    141     --libdir=&usr-lib-mx32;          \
     141    --libdir=/usr/libx32          \
    142142    --sysconfdir=/etc             \
    143143    --with-xz                     \
    144144    --with-zlib                   \
    145145    --host=x86_64-pc-linux-gnux32 \
    146     --with-rootlibdir=&usr-lib-mx32;</userinput></screen>
     146    --with-rootlibdir=/usr/libx32</userinput></screen>
    147147
    148148    <para>Compile the package:</para>
     
    153153
    154154<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    155 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     155cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    156156rm -rf DESTDIR</userinput></screen>
    157157
  • chapter08/libcap.xml

    r51c01bff r0ebda11  
    9898
    9999<screen><userinput remap="install">make lib=lib32 prefix=$PWD/DESTDIR/usr -C libcap install
    100 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
    101 sed -e "s|^libdir=.*|libdir=&usr-lib-m32;|" -i &usr-lib-m32;/pkgconfig/lib{cap,psx}.pc
    102 chmod -v 755 &usr-lib-m32;/libcap.so.&libcap-version;
     100cp -Rv DESTDIR/usr/lib32/* /usr/lib32
     101sed -e "s|^libdir=.*|libdir=/usr/lib32|" -i /usr/lib32/pkgconfig/lib{cap,psx}.pc
     102chmod -v 755 /usr/lib32/libcap.so.&libcap-version;
    103103rm -rf DESTDIR</userinput></screen>
    104104
     
    123123
    124124<screen><userinput remap="install">make lib=libx32 prefix=$PWD/DESTDIR/usr -C libcap install
    125 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
    126 sed -e "s|^libdir=.*|libdir=&usr-lib-mx32;|" -i &usr-lib-mx32;/pkgconfig/lib{cap,psx}.pc
    127 chmod -v 755 &usr-lib-mx32;/libcap.so.&libcap-version;
     125cp -Rv DESTDIR/usr/libx32/* /usr/libx32
     126sed -e "s|^libdir=.*|libdir=/usr/libx32|" -i /usr/libx32/pkgconfig/lib{cap,psx}.pc
     127chmod -v 755 /usr/libx32/libcap.so.&libcap-version;
    128128rm -rf DESTDIR</userinput></screen>
    129129
  • chapter08/libelf.xml

    r51c01bff r0ebda11  
    8484<screen><userinput remap="configure">CC="gcc -m32" ./configure \
    8585    --prefix=/usr            \
    86     --libdir=&usr-lib-m32;     \
     86    --libdir=/usr/lib32     \
    8787    --host=i686-pc-linux-gnu \
    8888    --disable-debuginfod     \
     
    9696
    9797<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install
    98 install -vDm644 config/libelf.pc DESTDIR&usr-lib-m32;/pkgconfig/libelf.pc
    99 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     98install -vDm644 config/libelf.pc DESTDIR/usr/lib32/pkgconfig/libelf.pc
     99cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    100100rm -rf DESTDIR</userinput></screen>
    101101
     
    117117<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    118118    --prefix=/usr                 \
    119     --libdir=&usr-lib-m32;           \
     119    --libdir=/usr/lib32           \
    120120    --host=x86_64-pc-linux-gnux32 \
    121121    --disable-debuginfod          \
     
    129129
    130130<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install
    131 install -vDm644 config/libelf.pc DESTDIR&usr-lib-mx32;/pkgconfig/libelf.pc
    132 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     131install -vDm644 config/libelf.pc DESTDIR/usr/libx32/pkgconfig/libelf.pc
     132cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    133133rm -rf DESTDIR</userinput></screen>
    134134
  • chapter08/libffi.xml

    r51c01bff r0ebda11  
    104104    --prefix=/usr            \
    105105    --disable-static         \
    106     --libdir=&usr-lib-m32;     \
     106    --libdir=/usr/lib32     \
    107107    --with-gcc-arch=i686     \
    108108    --host=i686-pc-linux-gnu</userinput></screen>
     
    119119
    120120<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    121 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     121cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    122122rm -rf DESTDIR</userinput></screen>
    123123
     
    140140    --prefix=/usr            \
    141141    --disable-static         \
    142     --libdir=&usr-lib-mx32;     \
     142    --libdir=/usr/libx32     \
    143143    --with-gcc-arch=x86_64   \
    144144    --host=x86_64-unknown-linux-gnux32</userinput></screen>
     
    155155
    156156<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    157 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     157cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    158158rm -rf DESTDIR</userinput></screen>
    159159
  • chapter08/libtool.xml

    r51c01bff r0ebda11  
    9393<screen><userinput remap="configure">CC="gcc -m32" ./configure \
    9494    --prefix=/usr         \
    95     --libdir=&usr-lib-m32;  \
     95    --libdir=/usr/lib32  \
    9696    --host=i686-pc-linux-gnu</userinput></screen>
    9797
     
    103103
    104104<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    105 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     105cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    106106rm -rf DESTDIR</userinput></screen>
    107107
     
    123123<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    124124    --prefix=/usr         \
    125     --libdir=&usr-lib-mx32;  \
     125    --libdir=/usr/libx32  \
    126126    --host=x86_64-pc-linux-gnux32</userinput></screen>
    127127
     
    133133
    134134<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    135 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     135cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    136136rm -rf DESTDIR</userinput></screen>
    137137
  • chapter08/ncurses.xml

    r51c01bff r0ebda11  
    166166./configure --prefix=/usr           \
    167167            --host=i686-pc-linux-gnu \
    168             --libdir=&usr-lib-m32;     \
     168            --libdir=/usr/lib32     \
    169169            --mandir=/usr/share/man \
    170170            --with-shared           \
     
    173173            --enable-pc-files       \
    174174            --enable-widec          \
    175             --with-pkg-config-libdir=&usr-lib-m32;/pkgconfig</userinput></screen>
     175            --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen>
    176176
    177177    <para>Compile the package:</para>
     
    182182
    183183<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    184 mkdir -p DESTDIR&usr-lib-m32;/pkgconfig
     184mkdir -p DESTDIR/usr/lib32/pkgconfig
    185185for lib in ncurses form panel menu ; do
    186     rm -vf                    DESTDIR&usr-lib-m32;/lib${lib}.so
    187     echo "INPUT(-l${lib}w)" > DESTDIR&usr-lib-m32;/lib${lib}.so
    188     ln -svf ${lib}w.pc        DESTDIR&usr-lib-m32;/pkgconfig/$lib.pc
     186    rm -vf                    DESTDIR/usr/lib32/lib${lib}.so
     187    echo "INPUT(-l${lib}w)" > DESTDIR/usr/lib32/lib${lib}.so
     188    ln -svf ${lib}w.pc        DESTDIR/usr/lib32/pkgconfig/$lib.pc
    189189done
    190 rm -vf                     DESTDIR&usr-lib-m32;/libcursesw.so
    191 echo "INPUT(-lncursesw)" > DESTDIR&usr-lib-m32;/libcursesw.so
    192 ln -sfv libncurses.so      DESTDIR&usr-lib-m32;/libcurses.so
    193 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     190rm -vf                     DESTDIR/usr/lib32/libcursesw.so
     191echo "INPUT(-lncursesw)" > DESTDIR/usr/lib32/libcursesw.so
     192ln -sfv libncurses.so      DESTDIR/usr/lib32/libcurses.so
     193cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    194194rm -rf DESTDIR</userinput></screen>
    195195
     
    211211./configure --prefix=/usr           \
    212212            --host=x86_64-pc-linux-gnux32 \
    213             --libdir=&usr-lib-mx32;    \
     213            --libdir=/usr/libx32    \
    214214            --mandir=/usr/share/man \
    215215            --with-shared           \
     
    218218            --enable-pc-files       \
    219219            --enable-widec          \
    220             --with-pkg-config-libdir=&usr-lib-mx32;/pkgconfig</userinput></screen>
     220            --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen>
    221221
    222222    <para>Compile the package:</para>
     
    227227
    228228<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    229 mkdir -p DESTDIR&usr-lib-mx32;/pkgconfig
     229mkdir -p DESTDIR/usr/libx32/pkgconfig
    230230for lib in ncurses form panel menu ; do
    231     rm -vf                    DESTDIR&usr-lib-mx32;/lib${lib}.so
    232     echo "INPUT(-l${lib}w)" > DESTDIR&usr-lib-mx32;/lib${lib}.so
    233     ln -svf ${lib}w.pc        DESTDIR&usr-lib-mx32;/pkgconfig/$lib.pc
     231    rm -vf                    DESTDIR/usr/libx32/lib${lib}.so
     232    echo "INPUT(-l${lib}w)" > DESTDIR/usr/libx32/lib${lib}.so
     233    ln -svf ${lib}w.pc        DESTDIR/usr/libx32/pkgconfig/$lib.pc
    234234done
    235 rm -vf                     DESTDIR&usr-lib-mx32;/libcursesw.so
    236 echo "INPUT(-lncursesw)" > DESTDIR&usr-lib-mx32;/libcursesw.so
    237 ln -sfv libncurses.so      DESTDIR&usr-lib-mx32;/libcurses.so
    238 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     235rm -vf                     DESTDIR/usr/libx32/libcursesw.so
     236echo "INPUT(-lncursesw)" > DESTDIR/usr/libx32/libcursesw.so
     237ln -sfv libncurses.so      DESTDIR/usr/libx32/libcurses.so
     238cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    239239rm -rf DESTDIR</userinput></screen>
    240240
  • chapter08/openssl.xml

    r51c01bff r0ebda11  
    9898    ./config               \
    9999    --prefix=/usr          \
    100     --libdir=&usr-lib-m32;    \
     100    --libdir=/usr/lib32    \
    101101    --openssldir=/etc/ssl  \
    102102    --libdir=lib32         \
     
    111111
    112112<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    113 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     113cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    114114rm -rf DESTDIR</userinput></screen>
    115115
     
    134134    ./config              \
    135135    --prefix=/usr         \
    136     --libdir=&usr-lib-mx32;  \
     136    --libdir=/usr/libx32  \
    137137    --openssldir=/etc/ssl \
    138138    --libdir=libx32       \
     
    147147
    148148<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    149 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     149cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    150150rm -rf DESTDIR</userinput></screen>
    151151
  • chapter08/readline.xml

    r51c01bff r0ebda11  
    116116<screen><userinput remap="configure">CC="gcc -m32" ./configure \
    117117    --prefix=/usr                     \
    118     --libdir=&usr-lib-m32;               \
     118    --libdir=/usr/lib32               \
    119119    --disable-static                  \
    120120    --host=i686-pc-linux-gnu</userinput></screen>
     
    127127
    128128<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    129 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     129cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    130130rm -rf DESTDIR</userinput></screen>
    131131
     
    147147<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    148148    --prefix=/usr          \
    149     --libdir=&usr-lib-mx32;   \
     149    --libdir=/usr/libx32   \
    150150    --disable-static       \
    151151    --host=x86_64-pc-linux-gnux32</userinput></screen>
     
    158158
    159159<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    160 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     160cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    161161rm -rf DESTDIR</userinput></screen>
    162162
  • chapter08/revisedchroot.xml

    r51c01bff r0ebda11  
    4545
    4646<screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput><userinput arch="ml_32,ml_all">
    47 find &usr-lib-m32; -name \*.la -delete</userinput><userinput arch="ml_x32,ml_all">
    48 find &usr-lib-mx32; -name \*.la -delete</userinput></screen>
     47find /usr/lib32 -name \*.la -delete</userinput><userinput arch="ml_x32,ml_all">
     48find /usr/libx32 -name \*.la -delete</userinput></screen>
    4949
    5050   <para>For more information about libtool archive files, see the <ulink
  • chapter08/strippingagain.xml

    r51c01bff r0ebda11  
    4545done</userinput>
    4646<userinput arch="ml_32,ml_all">
    47 cd &usr-lib-m32;
     47cd /usr/lib32
    4848for LIB in $save_usrlib; do
    4949    objcopy --only-keep-debug $LIB $LIB.dbg
     
    5252done</userinput>
    5353<userinput arch="ml_x32,ml_all">
    54 cd &usr-lib-mx32;
     54cd /usr/libx32
    5555for LIB in $save_usrlib; do
    5656    objcopy --only-keep-debug $LIB $LIB.dbg
     
    7171<screen><userinput>find /usr/lib -type f -name \*.a \
    7272   -exec strip --strip-debug {} ';'</userinput>
    73 <userinput arch="ml_32,ml_all">find &usr-lib-m32; -type f -name \*.a \
     73<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.a \
    7474   -exec strip --strip-debug {} ';'</userinput>
    75 <userinput arch="ml_x32,ml_all">find &usr-lib-mx32; -type f -name \*.a \
     75<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.a \
    7676   -exec strip --strip-debug {} ';'</userinput><userinput>
    7777
    7878find /usr/lib -type f -name \*.so* ! -name \*dbg \
    7979   -exec strip --strip-unneeded {} ';'</userinput>
    80 <userinput arch="ml_32,ml_all">find &usr-lib-m32; -type f -name \*.so* ! -name \*dbg \
     80<userinput arch="ml_32,ml_all">find /usr/lib32 -type f -name \*.so* ! -name \*dbg \
    8181   -exec strip --strip-unneeded {} ';'</userinput>
    82 <userinput arch="ml_x32,ml_all">find &usr-lib-mx32; -type f -name \*.so* ! -name \*dbg \
     82<userinput arch="ml_x32,ml_all">find /usr/libx32 -type f -name \*.so* ! -name \*dbg \
    8383   -exec strip --strip-unneeded {} ';'</userinput><userinput>
    8484
  • chapter08/systemd.xml

    r51c01bff r0ebda11  
    5252<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
    5353
     54<!-- Seems to be not needed anymore with 248
    5455    <para>Remove tests that cannot be built in chroot:</para>
    5556
    5657<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
     58-->
    5759
    5860    <para>Remove an unneeded group,
     
    240242    <para>Prepare systemd for compilation:</para>
    241243
    242     <screen><userinput remap="configure">PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
     244    <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
    243245CC="gcc -m32 -march=i686"              \
    244246CXX="g++ -m32 -march=i686"             \
     
    257259      -Dmount-path=/bin/mount          \
    258260      -Drootprefix=                    \
    259       -Drootlibdir=&usr-lib-m32;          \
     261      -Drootlibdir=/usr/lib32          \
    260262      -Dsplit-usr=true                 \
    261263      -Dsulogin-path=/sbin/sulogin     \
     
    272274
    273275<screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
    274 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     276cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    275277rm -rf DESTDIR
    276278rm -f /usr/bin/xsltproc</userinput></screen>
     
    300302    <para>Prepare systemd for compilation:</para>
    301303
    302 <screen><userinput remap="configure">PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
     304<screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
    303305CC="gcc -mx32"                          \
    304306CXX="g++ -mx32"                         \
     
    319321      -Dmount-path=/bin/mount           \
    320322      -Drootprefix=                     \
    321       -Drootlibdir=&usr-lib-mx32;          \
     323      -Drootlibdir=/usr/libx32          \
    322324      -Dsplit-usr=true                  \
    323325      -Dsulogin-path=/sbin/sulogin      \
     
    334336
    335337<screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
    336 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     338cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    337339rm -rf DESTDIR
    338340rm -f /usr/bin/xsltproc</userinput></screen>
  • chapter08/util-linux.xml

    r51c01bff r0ebda11  
    131131            --without-python         \
    132132            --without-systemd        \
    133             --libdir=&usr-lib-m32;      \
     133            --libdir=/usr/lib32      \
    134134            --host=i686-pc-linux-gnu \
    135135            --without-systemdsystemunitdir \
     
    148148            --disable-static         \
    149149            --without-python         \
    150             --libdir=&usr-lib-m32;      \
     150            --libdir=/usr/lib32      \
    151151            --host=i686-pc-linux-gnu \
    152152            --enable-libmount-force-mountinfo</userinput></screen>
     
    159159
    160160<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    161 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     161cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    162162rm -rf DESTDIR</userinput></screen>
    163163
     
    191191            --without-systemd    \
    192192            --without-systemdsystemunitdir \
    193             --libdir=&usr-lib-mx32; \
     193            --libdir=/usr/libx32 \
    194194            --host=x86_64-pc-linux-gnux32 \
    195195            --enable-libmount-force-mountinfo</userinput></screen>
     
    207207            --disable-static     \
    208208            --without-python     \
    209             --libdir=&usr-lib-mx32; \
     209            --libdir=/usr/libx32 \
    210210            --host=x86_64-pc-linux-gnux32 \
    211211            --enable-libmount-force-mountinfo</userinput></screen>
     
    218218
    219219<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    220 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     220cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    221221rm -rf DESTDIR</userinput></screen>
    222222
  • chapter08/xz.xml

    r51c01bff r0ebda11  
    8181    --prefix=/usr         \
    8282    --disable-static      \
    83     --libdir=&usr-lib-m32;   \
     83    --libdir=/usr/lib32   \
    8484    --host=i686-pc-linux-gnu</userinput></screen>
    8585
     
    9191
    9292<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    93 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     93cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    9494rm -rf DESTDIR</userinput></screen>
    9595
     
    112112    --prefix=/usr          \
    113113    --disable-static       \
    114     --libdir=&usr-lib-mx32;   \
     114    --libdir=/usr/libx32   \
    115115    --host=x86_64-pc-linux-gnux32</userinput></screen>
    116116
     
    122122
    123123<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    124 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     124cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    125125rm -rf DESTDIR</userinput></screen>
    126126
  • chapter08/zlib.xml

    r51c01bff r0ebda11  
    7979<screen><userinput remap="configure">CC="gcc -m32" \
    8080./configure --prefix=/usr \
    81     --libdir=&usr-lib-m32;</userinput></screen>
     81    --libdir=/usr/lib32</userinput></screen>
    8282
    8383    <para>Compile the package:</para>
     
    8888
    8989<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    90 cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
     90cp -Rv DESTDIR/usr/lib32/* /usr/lib32
    9191rm -rf DESTDIR</userinput></screen>
    9292
     
    106106<screen><userinput remap="configure">CC="gcc -mx32" \
    107107./configure --prefix=/usr    \
    108     --libdir=&usr-lib-mx32;</userinput></screen>
     108    --libdir=/usr/libx32</userinput></screen>
    109109
    110110    <para>Compile the package:</para>
     
    115115
    116116<screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
    117 cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
     117cp -Rv DESTDIR/usr/libx32/* /usr/libx32
    118118rm -rf DESTDIR</userinput></screen>
    119119
  • chapter08/zstd.xml

    r51c01bff r0ebda11  
    7878
    7979<screen><userinput remap="install">CC="gcc -m32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
    80 cp -Rv DESTDIR/usr/lib/* &usr-lib-m32;/
    81 sed -e "/^libdir/s/lib$&lib-m32;/" -i &usr-lib-m32;/pkgconfig/libzstd.pc
     80cp -Rv DESTDIR/usr/lib/* /usr/lib32/
     81sed -e "/^libdir/s/lib$/lib32/" -i /usr/lib32/pkgconfig/libzstd.pc
    8282rm -rf DESTDIR</userinput></screen>
    8383
     
    102102
    103103<screen><userinput remap="install">CC="gcc -mx32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
    104 cp -Rv DESTDIR/usr/lib/* &usr-lib-mx32;/
    105 sed -e "/^libdir/s/lib$&lib-mx32;/" -i &usr-lib-mx32;/pkgconfig/libzstd.pc
     104cp -Rv DESTDIR/usr/lib/* /usr/libx32/
     105sed -e "/^libdir/s/lib$/libx32/" -i /usr/libx32/pkgconfig/libzstd.pc
    106106rm -rf DESTDIR</userinput></screen>
    107107
  • general.ent

    r51c01bff r0ebda11  
    6464<!ENTITY % patches-entities SYSTEM "patches.ent">
    6565%patches-entities;
    66 
    67 <!-- multilib definitions -->
    68 <!ENTITY lib-m32          "/lib32">
    69 <!ENTITY lib-mx32         "/libx32">
    70 <!ENTITY usr-lib-m32      "/usr/lib32">
    71 <!ENTITY usr-lib-mx32     "/usr/libx32">
    72 <!ENTITY usr-inc-m32      "/usr/include/m32">
    73 <!ENTITY usr-inc-mx32     "/usr/include/mx32">
Note: See TracChangeset for help on using the changeset viewer.