Changeset 0ebda11
- Timestamp:
- 05/14/2021 10:47:43 AM (3 years ago)
- Branches:
- ml-11.0, multilib
- Children:
- 2606939
- Parents:
- 51c01bff
- Files:
-
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
chapter04/addinguser.xml
r51c01bff r0ebda11 85 85 x86_64) chown -v lfs $LFS/lib64 ;; 86 86 esac</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> 89 89 <screen arch="ml_all" ><userinput>chown -v lfs $LFS/{lib32,libx32}</userinput></screen> 90 90 -
chapter04/creatingminlayout.xml
r51c01bff r0ebda11 30 30 x86_64) mkdir -pv $LFS/lib64 ;; 31 31 esac</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 33 ln -sv usr/lib32 $LFS/lib32</userinput></screen> 34 <screen arch="ml_x32"><userinput>mkdir -pv $LFS/usr/libx32 35 ln -sv usr/libx32 $LFS/libx32</userinput></screen> 36 36 <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>37 ln -sv usr/lib32 $LFS/lib32 38 ln -sv usr/libx32 $LFS/libx32</userinput></screen> 39 39 40 40 <note> -
chapter05/gcc-pass1.xml
r51c01bff r0ebda11 79 79 80 80 <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)/' \ 82 82 -i.orig gcc/config/i386/t-linux64 83 83 </userinput></screen> -
chapter05/glibc.xml
r51c01bff r0ebda11 84 84 --enable-kernel=&min-kernel; \ 85 85 --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> 87 88 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure \ 88 89 --prefix=/usr \ … … 92 93 --with-headers=$LFS/usr/include \ 93 94 --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> 95 97 96 98 <variablelist> … … 130 132 <para>This ensures that the library is installed in /usr/lib instead 131 133 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> 132 142 </listitem> 133 143 </varlistentry> … … 197 207 </variablelist> 198 208 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 199 239 <caution> 200 240 <para>At this point, it is imperative to stop and ensure that the basic … … 246 286 247 287 <para>Now recompile for m32. The extracted source can be 248 reused but needs to cleaned before installing the m32288 reused but needs to be cleaned before installing the m32 249 289 version of Glibc.</para> 250 290 … … 266 306 --with-headers=$LFS/usr/include \ 267 307 --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> 271 312 272 313 <para>Compile the package:</para> … … 277 318 278 319 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 279 cp -a DESTDIR &usr-lib-m32;$LFS/usr/320 cp -a DESTDIR/usr/lib32 $LFS/usr/ 280 321 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-32.h \ 281 322 $LFS/usr/include/gnu/ 282 ln -svf ..&lib-m32;/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen> 323 ln -svf ../lib32/ld-linux.so.2 $LFS/lib/ld-linux.so.2</userinput></screen> 324 283 325 284 326 <caution> … … 317 359 318 360 <para>Now recompile for mx32. The extracted source can be 319 reused but needs to cleaned before installing the mx32361 reused but needs to be cleaned before installing the mx32 320 362 version of Glibc.</para> 321 363 … … 337 379 --with-headers=$LFS/usr/include \ 338 380 --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> 342 385 343 386 <para>Compile the package:</para> … … 348 391 349 392 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 350 cp -a DESTDIR &usr-lib-mx32;$LFS/usr/393 cp -a DESTDIR/usr/libx32 $LFS/usr/ 351 394 install -vm644 DESTDIR/usr/include/gnu/{lib-names,stubs}-x32.h \ 352 395 $LFS/usr/include/gnu/ 353 ln -svf .. &lib-mx32;/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen>396 ln -svf ../libx32/ld-linux-x32.so.2 $LFS/lib/ld-linux-x32.so.2</userinput></screen> 354 397 355 398 <caution> -
chapter06/gcc-pass2.xml
r51c01bff r0ebda11 71 71 72 72 <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)/' \ 74 74 -i.orig gcc/config/i386/t-linux64</userinput></screen> 75 75 <!-- -
chapter06/ncurses.xml
r51c01bff r0ebda11 168 168 --host=$LFS_TGT32 \ 169 169 --build=$(./config.guess) \ 170 --libdir= &usr-lib-m32;\170 --libdir=/usr/lib32 \ 171 171 --mandir=/usr/share/man \ 172 172 --with-shared \ … … 176 176 --enable-pc-files \ 177 177 --enable-widec \ 178 --with-pkg-config-libdir= &usr-lib-m32;/pkgconfig</userinput></screen>178 --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen> 179 179 180 180 <para>Compile the package:</para> … … 185 185 186 186 <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.so188 cp -Rv DESTDIR &usr-lib-m32;/* $LFS&usr-lib-m32;187 ln -s libncursesw.so DESTDIR/usr/lib32/libcursesw.so 188 cp -Rv DESTDIR/usr/lib32/* $LFS/usr/lib32 189 189 rm -rf DESTDIR</userinput></screen> 190 190 … … 208 208 --host=$LFS_TGTX32 \ 209 209 --build=$(./config.guess) \ 210 --libdir= &usr-lib-mx32;\210 --libdir=/usr/libx32 \ 211 211 --mandir=/usr/share/man \ 212 212 --with-shared \ … … 216 216 --enable-pc-files \ 217 217 --enable-widec \ 218 --with-pkg-config-libdir= &usr-lib-mx32;/pkgconfig</userinput></screen>218 --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen> 219 219 220 220 <para>Compile the package:</para> … … 225 225 226 226 <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.so228 cp -Rv DESTDIR &usr-lib-mx32;/* $LFS&usr-lib-mx32;227 ln -s libncursesw.so DESTDIR/usr/libx32/libcursesw.so 228 cp -Rv DESTDIR/usr/libx32/* $LFS/usr/libx32 229 229 rm -rf DESTDIR</userinput></screen> 230 230 -
chapter07/changingowner.xml
r51c01bff r0ebda11 41 41 <para arch="ml_32,ml_x32,ml_all">Some more directories exists for 42 42 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> 45 45 46 46 </sect1> -
chapter07/util-linux.xml
r51c01bff r0ebda11 152 152 --disable-static \ 153 153 --without-python \ 154 --libdir= &usr-lib-m32;\154 --libdir=/usr/lib32 \ 155 155 --host=i686-pc-linux-gnu</userinput></screen> 156 156 … … 162 162 163 163 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 164 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;164 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 165 165 rm -rf DESTDIR</userinput></screen> 166 166 … … 192 192 --disable-static \ 193 193 --without-python \ 194 --libdir= &usr-lib-mx32;\194 --libdir=/usr/libx32 \ 195 195 --host=x86_64-pc-linux-gnux32</userinput></screen> 196 196 … … 202 202 203 203 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 204 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;204 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 205 205 rm -rf DESTDIR</userinput></screen> 206 206 -
chapter08/acl.xml
r51c01bff r0ebda11 81 81 --prefix=/usr \ 82 82 --disable-static \ 83 --libdir= &usr-lib-m32;\84 --libexecdir= &usr-lib-m32;\83 --libdir=/usr/lib32 \ 84 --libexecdir=/usr/lib32 \ 85 85 --host=i686-pc-linux-gnu</userinput></screen> 86 86 … … 92 92 93 93 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 94 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;94 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 95 95 rm -rf DESTDIR</userinput></screen> 96 96 … … 113 113 --prefix=/usr \ 114 114 --disable-static \ 115 --libdir= &usr-lib-mx32;\116 --libexecdir= &usr-lib-mx32;\115 --libdir=/usr/libx32 \ 116 --libexecdir=/usr/libx32 \ 117 117 --host=x86_64-pc-linux-gnux32</userinput></screen> 118 118 … … 124 124 125 125 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 126 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;126 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 127 127 rm -rf DESTDIR</userinput></screen> 128 128 -
chapter08/attr.xml
r51c01bff r0ebda11 81 81 --prefix=/usr \ 82 82 --disable-static \ 83 --libdir= &usr-lib-m32;\83 --libdir=/usr/lib32 \ 84 84 --host=i686-pc-linux-gnu</userinput></screen> 85 85 … … 91 91 92 92 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 93 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;93 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 94 94 rm -rf DESTDIR</userinput></screen> 95 95 … … 112 112 --prefix=/usr \ 113 113 --disable-static \ 114 --libdir= &usr-lib-mx32;\114 --libdir=/usr/libx32 \ 115 115 --host=x86_64-pc-linux-gnux32</userinput></screen> 116 116 … … 122 122 123 123 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 124 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;124 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 125 125 rm -rf DESTDIR</userinput></screen> 126 126 -
chapter08/bzip2.xml
r51c01bff r0ebda11 119 119 <para>Install the package:</para> 120 120 121 <screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1.0.8122 ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so123 ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1124 ln -sf libbz2.so.1.0.8 &usr-lib-m32;/libbz2.so.1.0125 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 122 ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so 123 ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1 124 ln -sf libbz2.so.1.0.8 /usr/lib32/libbz2.so.1.0 125 install -Dm644 libbz2.a /usr/lib32/libbz2.a</userinput></screen> 126 126 127 127 </sect2><!-- m32 --> … … 146 146 <para>Install the package:</para> 147 147 148 <screen><userinput remap="install">install -Dm755 libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1.0.8149 ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so150 ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1151 ln -sf libbz2.so.1.0.8 &usr-lib-mx32;/libbz2.so.1.0152 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 149 ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so 150 ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1 151 ln -sf libbz2.so.1.0.8 /usr/libx32/libbz2.so.1.0 152 install -Dm644 libbz2.a /usr/libx32/libbz2.a</userinput></screen> 153 153 154 154 </sect2><!-- mx32 --> -
chapter08/eudev.xml
r51c01bff r0ebda11 102 102 --bindir=/sbin \ 103 103 --sbindir=/sbin \ 104 --libdir= &usr-lib-m32;\104 --libdir=/usr/lib32 \ 105 105 --sysconfdir=/etc \ 106 --libexecdir= &lib-m32;\106 --libexecdir=/lib32 \ 107 107 --with-rootprefix= \ 108 --with-rootlibdir= &usr-lib-m32;\108 --with-rootlibdir=/usr/lib32 \ 109 109 --disable-manpages \ 110 110 --disable-static \ … … 118 118 119 119 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 120 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;120 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 121 121 rm -rf DESTDIR</userinput></screen> 122 122 … … 140 140 --bindir=/sbin \ 141 141 --sbindir=/sbin \ 142 --libdir= &usr-lib-mx32;\142 --libdir=/usr/libx32 \ 143 143 --sysconfdir=/etc \ 144 --libexecdir= &lib-mx32;\144 --libexecdir=/libx32 \ 145 145 --with-rootprefix= \ 146 --with-rootlibdir= &usr-lib-mx32;\146 --with-rootlibdir=/usr/libx32 \ 147 147 --disable-manpages \ 148 148 --disable-static \ … … 156 156 157 157 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 158 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;158 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 159 159 rm -rf DESTDIR</userinput></screen> 160 160 -
chapter08/expat.xml
r51c01bff r0ebda11 83 83 <screen><userinput remap="configure">CC="gcc -m32" ./configure \ 84 84 --prefix=/usr \ 85 --libdir= &usr-lib-m32;\85 --libdir=/usr/lib32 \ 86 86 --host=i686-pc-linux-gnu</userinput></screen> 87 87 … … 93 93 94 94 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 95 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;95 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 96 96 rm -rf DESTDIR</userinput></screen> 97 97 … … 115 115 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \ 116 116 --prefix=/usr \ 117 --libdir= &usr-lib-mx32;\117 --libdir=/usr/libx32 \ 118 118 --host=x86_64-pc-linux-gnux32</userinput></screen> 119 119 … … 125 125 126 126 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 127 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;127 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 128 128 rm -rf DESTDIR</userinput></screen> 129 129 -
chapter08/file.xml
r51c01bff r0ebda11 75 75 <screen><userinput remap="configure">CC="gcc -m32" ./configure \ 76 76 --prefix=/usr \ 77 --libdir= &usr-lib-m32;\77 --libdir=/usr/lib32 \ 78 78 --host=i686-pc-linux-gnu</userinput></screen> 79 79 … … 85 85 86 86 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 87 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;87 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 88 88 rm -rf DESTDIR</userinput></screen> 89 89 … … 105 105 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \ 106 106 --prefix=/usr \ 107 --libdir= &usr-lib-mx32;\107 --libdir=/usr/libx32 \ 108 108 --host=x86_64-pc-linux-gnux32</userinput></screen> 109 109 … … 115 115 116 116 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 117 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;117 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 118 118 rm -rf DESTDIR</userinput></screen> 119 119 -
chapter08/gcc.xml
r51c01bff r0ebda11 56 56 57 57 <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)/' \ 59 59 -i.orig gcc/config/i386/t-linux64</userinput></screen> 60 60 -
chapter08/glibc.xml
r51c01bff r0ebda11 73 73 --enable-stack-protector=strong \ 74 74 --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> 76 77 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr \ 77 78 --disable-werror \ … … 80 81 --with-headers=/usr/include \ 81 82 --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> 83 85 84 86 <variablelist> … … 125 127 <para>This variable sets the correct library for all 126 128 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> 127 137 </listitem> 128 138 </varlistentry> … … 222 232 223 233 <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> 224 239 225 240 <para>Install the configuration file and runtime directory for … … 483 498 484 499 <para>Now recompile for m32. The extracted source can be 485 reused but needs to cleaned before installing the m32500 reused but needs to be cleaned before installing the m32 486 501 version of Glibc.</para> 487 502 … … 502 517 --with-headers=/usr/include \ 503 518 --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> 507 523 508 524 <para>Compile the package:</para> … … 513 529 514 530 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 515 cp -a DESTDIR &usr-lib-m32;/* &usr-lib-m32;/531 cp -a DESTDIR/usr/lib32/* /usr/lib32/ 516 532 install -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 535 ln -svf ../lib32/ld-linux.so.2 /lib/ld-linux.so.2 536 --> 519 537 520 538 <para>Add the library name to the dynamic loader config:</para> 521 539 522 <screen role="install"><userinput>echo " &usr-lib-m32;" >> /etc/ld.so.conf</userinput></screen>540 <screen role="install"><userinput>echo "/usr/lib32" >> /etc/ld.so.conf</userinput></screen> 523 541 524 542 <caution> … … 557 575 558 576 <para>Now recompile for mx32. The extracted source can be 559 reused but needs to cleaned before installing the mx32577 reused but needs to be cleaned before installing the mx32 560 578 version of Glibc.</para> 561 579 … … 574 592 --build=$(../scripts/config.guess) \ 575 593 --enable-kernel=&min-kernel; \ 576 --with-headers= $LFS/usr/include\594 --with-headers=/usr/include \ 577 595 --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> 581 600 582 601 <para>Compile the package:</para> … … 587 606 588 607 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 589 cp -a DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;/608 cp -a DESTDIR/usr/libx32/* /usr/libx32/ 590 609 install -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 612 ln -svf ../libx32/ld-linux-x32.so.2 /lib/ld-linux-x32.so.2 613 --> 594 614 <para>Add the library name to the dynamic loader config:</para> 595 615 596 <screen role="install"><userinput>echo " &usr-lib-mx32;" >> /etc/ld.so.conf</userinput></screen>616 <screen role="install"><userinput>echo "/usr/libx32" >> /etc/ld.so.conf</userinput></screen> 597 617 598 618 <caution> -
chapter08/gmp.xml
r51c01bff r0ebda11 143 143 CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \ 144 144 CXXFLAGS="$CFLAGS" \ 145 PKG_CONFIG_PATH=" &usr-lib-m32;/pkgconfig" \145 PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \ 146 146 ./configure \ 147 147 --prefix=/usr \ 148 148 --disable-static \ 149 149 --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> 152 152 153 153 <variablelist> … … 155 155 156 156 <varlistentry> 157 <term><parameter>--includedir= &usr-inc-m32;/gmp</parameter></term>157 <term><parameter>--includedir=/usr/include/m32/gmp</parameter></term> 158 158 <listitem> 159 159 <para>Some definitions in gmp.h differs for each arch but … … 187 187 188 188 <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;/189 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 190 cp -Rv DESTDIR/usr/include/m32/* /usr/include/m32/ 191 191 rm -rf DESTDIR</userinput></screen> 192 192 … … 215 215 CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \ 216 216 CXXFLAGS="$CFLAGS" \ 217 PKG_CONFIG_PATH=" &usr-lib-mx32;/pkgconfig" \217 PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \ 218 218 ./configure \ 219 219 --prefix=/usr \ 220 220 --disable-static \ 221 221 --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> 224 224 225 225 <para>Compile the package:</para> … … 245 245 246 246 <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;/247 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 248 cp -Rv DESTDIR/usr/include/mx32/* /usr/include/mx32/ 249 249 rm -rf DESTDIR</userinput></screen> 250 250 -
chapter08/kmod.xml
r51c01bff r0ebda11 102 102 --prefix=/usr \ 103 103 --bindir=/bin \ 104 --libdir= &usr-lib-m32;\104 --libdir=/usr/lib32 \ 105 105 --sysconfdir=/etc \ 106 106 --with-xz \ 107 107 --with-zlib \ 108 108 --host=i686-pc-linux-gnu \ 109 --with-rootlibdir= &usr-lib-m32;</userinput></screen>109 --with-rootlibdir=/usr/lib32</userinput></screen> 110 110 111 111 <para>Compile the package:</para> … … 116 116 117 117 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 118 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;118 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 119 119 rm -rf DESTDIR</userinput></screen> 120 120 … … 139 139 --prefix=/usr \ 140 140 --bindir=/bin \ 141 --libdir= &usr-lib-mx32;\141 --libdir=/usr/libx32 \ 142 142 --sysconfdir=/etc \ 143 143 --with-xz \ 144 144 --with-zlib \ 145 145 --host=x86_64-pc-linux-gnux32 \ 146 --with-rootlibdir= &usr-lib-mx32;</userinput></screen>146 --with-rootlibdir=/usr/libx32</userinput></screen> 147 147 148 148 <para>Compile the package:</para> … … 153 153 154 154 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 155 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;155 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 156 156 rm -rf DESTDIR</userinput></screen> 157 157 -
chapter08/libcap.xml
r51c01bff r0ebda11 98 98 99 99 <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}.pc102 chmod -v 755 &usr-lib-m32;/libcap.so.&libcap-version;100 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 101 sed -e "s|^libdir=.*|libdir=/usr/lib32|" -i /usr/lib32/pkgconfig/lib{cap,psx}.pc 102 chmod -v 755 /usr/lib32/libcap.so.&libcap-version; 103 103 rm -rf DESTDIR</userinput></screen> 104 104 … … 123 123 124 124 <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}.pc127 chmod -v 755 &usr-lib-mx32;/libcap.so.&libcap-version;125 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 126 sed -e "s|^libdir=.*|libdir=/usr/libx32|" -i /usr/libx32/pkgconfig/lib{cap,psx}.pc 127 chmod -v 755 /usr/libx32/libcap.so.&libcap-version; 128 128 rm -rf DESTDIR</userinput></screen> 129 129 -
chapter08/libelf.xml
r51c01bff r0ebda11 84 84 <screen><userinput remap="configure">CC="gcc -m32" ./configure \ 85 85 --prefix=/usr \ 86 --libdir= &usr-lib-m32;\86 --libdir=/usr/lib32 \ 87 87 --host=i686-pc-linux-gnu \ 88 88 --disable-debuginfod \ … … 96 96 97 97 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install 98 install -vDm644 config/libelf.pc DESTDIR &usr-lib-m32;/pkgconfig/libelf.pc99 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;98 install -vDm644 config/libelf.pc DESTDIR/usr/lib32/pkgconfig/libelf.pc 99 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 100 100 rm -rf DESTDIR</userinput></screen> 101 101 … … 117 117 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \ 118 118 --prefix=/usr \ 119 --libdir= &usr-lib-m32;\119 --libdir=/usr/lib32 \ 120 120 --host=x86_64-pc-linux-gnux32 \ 121 121 --disable-debuginfod \ … … 129 129 130 130 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install 131 install -vDm644 config/libelf.pc DESTDIR &usr-lib-mx32;/pkgconfig/libelf.pc132 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;131 install -vDm644 config/libelf.pc DESTDIR/usr/libx32/pkgconfig/libelf.pc 132 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 133 133 rm -rf DESTDIR</userinput></screen> 134 134 -
chapter08/libffi.xml
r51c01bff r0ebda11 104 104 --prefix=/usr \ 105 105 --disable-static \ 106 --libdir= &usr-lib-m32;\106 --libdir=/usr/lib32 \ 107 107 --with-gcc-arch=i686 \ 108 108 --host=i686-pc-linux-gnu</userinput></screen> … … 119 119 120 120 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 121 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;121 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 122 122 rm -rf DESTDIR</userinput></screen> 123 123 … … 140 140 --prefix=/usr \ 141 141 --disable-static \ 142 --libdir= &usr-lib-mx32;\142 --libdir=/usr/libx32 \ 143 143 --with-gcc-arch=x86_64 \ 144 144 --host=x86_64-unknown-linux-gnux32</userinput></screen> … … 155 155 156 156 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 157 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;157 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 158 158 rm -rf DESTDIR</userinput></screen> 159 159 -
chapter08/libtool.xml
r51c01bff r0ebda11 93 93 <screen><userinput remap="configure">CC="gcc -m32" ./configure \ 94 94 --prefix=/usr \ 95 --libdir= &usr-lib-m32;\95 --libdir=/usr/lib32 \ 96 96 --host=i686-pc-linux-gnu</userinput></screen> 97 97 … … 103 103 104 104 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 105 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;105 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 106 106 rm -rf DESTDIR</userinput></screen> 107 107 … … 123 123 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \ 124 124 --prefix=/usr \ 125 --libdir= &usr-lib-mx32;\125 --libdir=/usr/libx32 \ 126 126 --host=x86_64-pc-linux-gnux32</userinput></screen> 127 127 … … 133 133 134 134 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 135 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;135 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 136 136 rm -rf DESTDIR</userinput></screen> 137 137 -
chapter08/ncurses.xml
r51c01bff r0ebda11 166 166 ./configure --prefix=/usr \ 167 167 --host=i686-pc-linux-gnu \ 168 --libdir= &usr-lib-m32;\168 --libdir=/usr/lib32 \ 169 169 --mandir=/usr/share/man \ 170 170 --with-shared \ … … 173 173 --enable-pc-files \ 174 174 --enable-widec \ 175 --with-pkg-config-libdir= &usr-lib-m32;/pkgconfig</userinput></screen>175 --with-pkg-config-libdir=/usr/lib32/pkgconfig</userinput></screen> 176 176 177 177 <para>Compile the package:</para> … … 182 182 183 183 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 184 mkdir -p DESTDIR &usr-lib-m32;/pkgconfig184 mkdir -p DESTDIR/usr/lib32/pkgconfig 185 185 for lib in ncurses form panel menu ; do 186 rm -vf DESTDIR &usr-lib-m32;/lib${lib}.so187 echo "INPUT(-l${lib}w)" > DESTDIR &usr-lib-m32;/lib${lib}.so188 ln -svf ${lib}w.pc DESTDIR &usr-lib-m32;/pkgconfig/$lib.pc186 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 189 189 done 190 rm -vf DESTDIR &usr-lib-m32;/libcursesw.so191 echo "INPUT(-lncursesw)" > DESTDIR &usr-lib-m32;/libcursesw.so192 ln -sfv libncurses.so DESTDIR &usr-lib-m32;/libcurses.so193 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;190 rm -vf DESTDIR/usr/lib32/libcursesw.so 191 echo "INPUT(-lncursesw)" > DESTDIR/usr/lib32/libcursesw.so 192 ln -sfv libncurses.so DESTDIR/usr/lib32/libcurses.so 193 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 194 194 rm -rf DESTDIR</userinput></screen> 195 195 … … 211 211 ./configure --prefix=/usr \ 212 212 --host=x86_64-pc-linux-gnux32 \ 213 --libdir= &usr-lib-mx32;\213 --libdir=/usr/libx32 \ 214 214 --mandir=/usr/share/man \ 215 215 --with-shared \ … … 218 218 --enable-pc-files \ 219 219 --enable-widec \ 220 --with-pkg-config-libdir= &usr-lib-mx32;/pkgconfig</userinput></screen>220 --with-pkg-config-libdir=/usr/libx32/pkgconfig</userinput></screen> 221 221 222 222 <para>Compile the package:</para> … … 227 227 228 228 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 229 mkdir -p DESTDIR &usr-lib-mx32;/pkgconfig229 mkdir -p DESTDIR/usr/libx32/pkgconfig 230 230 for lib in ncurses form panel menu ; do 231 rm -vf DESTDIR &usr-lib-mx32;/lib${lib}.so232 echo "INPUT(-l${lib}w)" > DESTDIR &usr-lib-mx32;/lib${lib}.so233 ln -svf ${lib}w.pc DESTDIR &usr-lib-mx32;/pkgconfig/$lib.pc231 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 234 234 done 235 rm -vf DESTDIR &usr-lib-mx32;/libcursesw.so236 echo "INPUT(-lncursesw)" > DESTDIR &usr-lib-mx32;/libcursesw.so237 ln -sfv libncurses.so DESTDIR &usr-lib-mx32;/libcurses.so238 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;235 rm -vf DESTDIR/usr/libx32/libcursesw.so 236 echo "INPUT(-lncursesw)" > DESTDIR/usr/libx32/libcursesw.so 237 ln -sfv libncurses.so DESTDIR/usr/libx32/libcurses.so 238 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 239 239 rm -rf DESTDIR</userinput></screen> 240 240 -
chapter08/openssl.xml
r51c01bff r0ebda11 98 98 ./config \ 99 99 --prefix=/usr \ 100 --libdir= &usr-lib-m32;\100 --libdir=/usr/lib32 \ 101 101 --openssldir=/etc/ssl \ 102 102 --libdir=lib32 \ … … 111 111 112 112 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 113 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;113 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 114 114 rm -rf DESTDIR</userinput></screen> 115 115 … … 134 134 ./config \ 135 135 --prefix=/usr \ 136 --libdir= &usr-lib-mx32;\136 --libdir=/usr/libx32 \ 137 137 --openssldir=/etc/ssl \ 138 138 --libdir=libx32 \ … … 147 147 148 148 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 149 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;149 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 150 150 rm -rf DESTDIR</userinput></screen> 151 151 -
chapter08/readline.xml
r51c01bff r0ebda11 116 116 <screen><userinput remap="configure">CC="gcc -m32" ./configure \ 117 117 --prefix=/usr \ 118 --libdir= &usr-lib-m32;\118 --libdir=/usr/lib32 \ 119 119 --disable-static \ 120 120 --host=i686-pc-linux-gnu</userinput></screen> … … 127 127 128 128 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 129 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;129 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 130 130 rm -rf DESTDIR</userinput></screen> 131 131 … … 147 147 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \ 148 148 --prefix=/usr \ 149 --libdir= &usr-lib-mx32;\149 --libdir=/usr/libx32 \ 150 150 --disable-static \ 151 151 --host=x86_64-pc-linux-gnux32</userinput></screen> … … 158 158 159 159 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 160 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;160 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 161 161 rm -rf DESTDIR</userinput></screen> 162 162 -
chapter08/revisedchroot.xml
r51c01bff r0ebda11 45 45 46 46 <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>47 find /usr/lib32 -name \*.la -delete</userinput><userinput arch="ml_x32,ml_all"> 48 find /usr/libx32 -name \*.la -delete</userinput></screen> 49 49 50 50 <para>For more information about libtool archive files, see the <ulink -
chapter08/strippingagain.xml
r51c01bff r0ebda11 45 45 done</userinput> 46 46 <userinput arch="ml_32,ml_all"> 47 cd &usr-lib-m32;47 cd /usr/lib32 48 48 for LIB in $save_usrlib; do 49 49 objcopy --only-keep-debug $LIB $LIB.dbg … … 52 52 done</userinput> 53 53 <userinput arch="ml_x32,ml_all"> 54 cd &usr-lib-mx32;54 cd /usr/libx32 55 55 for LIB in $save_usrlib; do 56 56 objcopy --only-keep-debug $LIB $LIB.dbg … … 71 71 <screen><userinput>find /usr/lib -type f -name \*.a \ 72 72 -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 \ 74 74 -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 \ 76 76 -exec strip --strip-debug {} ';'</userinput><userinput> 77 77 78 78 find /usr/lib -type f -name \*.so* ! -name \*dbg \ 79 79 -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 \ 81 81 -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 \ 83 83 -exec strip --strip-unneeded {} ';'</userinput><userinput> 84 84 -
chapter08/systemd.xml
r51c01bff r0ebda11 52 52 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen> 53 53 54 <!-- Seems to be not needed anymore with 248 54 55 <para>Remove tests that cannot be built in chroot:</para> 55 56 56 57 <screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen> 58 --> 57 59 58 60 <para>Remove an unneeded group, … … 240 242 <para>Prepare systemd for compilation:</para> 241 243 242 <screen><userinput remap="configure">PKG_CONFIG_PATH=" &usr-lib-m32;/pkgconfig" \244 <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \ 243 245 CC="gcc -m32 -march=i686" \ 244 246 CXX="g++ -m32 -march=i686" \ … … 257 259 -Dmount-path=/bin/mount \ 258 260 -Drootprefix= \ 259 -Drootlibdir= &usr-lib-m32;\261 -Drootlibdir=/usr/lib32 \ 260 262 -Dsplit-usr=true \ 261 263 -Dsulogin-path=/sbin/sulogin \ … … 272 274 273 275 <screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install 274 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;276 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 275 277 rm -rf DESTDIR 276 278 rm -f /usr/bin/xsltproc</userinput></screen> … … 300 302 <para>Prepare systemd for compilation:</para> 301 303 302 <screen><userinput remap="configure">PKG_CONFIG_PATH=" &usr-lib-mx32;/pkgconfig" \304 <screen><userinput remap="configure">PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \ 303 305 CC="gcc -mx32" \ 304 306 CXX="g++ -mx32" \ … … 319 321 -Dmount-path=/bin/mount \ 320 322 -Drootprefix= \ 321 -Drootlibdir= &usr-lib-mx32;\323 -Drootlibdir=/usr/libx32 \ 322 324 -Dsplit-usr=true \ 323 325 -Dsulogin-path=/sbin/sulogin \ … … 334 336 335 337 <screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install 336 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;338 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 337 339 rm -rf DESTDIR 338 340 rm -f /usr/bin/xsltproc</userinput></screen> -
chapter08/util-linux.xml
r51c01bff r0ebda11 131 131 --without-python \ 132 132 --without-systemd \ 133 --libdir= &usr-lib-m32;\133 --libdir=/usr/lib32 \ 134 134 --host=i686-pc-linux-gnu \ 135 135 --without-systemdsystemunitdir \ … … 148 148 --disable-static \ 149 149 --without-python \ 150 --libdir= &usr-lib-m32;\150 --libdir=/usr/lib32 \ 151 151 --host=i686-pc-linux-gnu \ 152 152 --enable-libmount-force-mountinfo</userinput></screen> … … 159 159 160 160 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 161 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;161 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 162 162 rm -rf DESTDIR</userinput></screen> 163 163 … … 191 191 --without-systemd \ 192 192 --without-systemdsystemunitdir \ 193 --libdir= &usr-lib-mx32;\193 --libdir=/usr/libx32 \ 194 194 --host=x86_64-pc-linux-gnux32 \ 195 195 --enable-libmount-force-mountinfo</userinput></screen> … … 207 207 --disable-static \ 208 208 --without-python \ 209 --libdir= &usr-lib-mx32;\209 --libdir=/usr/libx32 \ 210 210 --host=x86_64-pc-linux-gnux32 \ 211 211 --enable-libmount-force-mountinfo</userinput></screen> … … 218 218 219 219 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 220 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;220 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 221 221 rm -rf DESTDIR</userinput></screen> 222 222 -
chapter08/xz.xml
r51c01bff r0ebda11 81 81 --prefix=/usr \ 82 82 --disable-static \ 83 --libdir= &usr-lib-m32;\83 --libdir=/usr/lib32 \ 84 84 --host=i686-pc-linux-gnu</userinput></screen> 85 85 … … 91 91 92 92 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 93 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;93 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 94 94 rm -rf DESTDIR</userinput></screen> 95 95 … … 112 112 --prefix=/usr \ 113 113 --disable-static \ 114 --libdir= &usr-lib-mx32;\114 --libdir=/usr/libx32 \ 115 115 --host=x86_64-pc-linux-gnux32</userinput></screen> 116 116 … … 122 122 123 123 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 124 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;124 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 125 125 rm -rf DESTDIR</userinput></screen> 126 126 -
chapter08/zlib.xml
r51c01bff r0ebda11 79 79 <screen><userinput remap="configure">CC="gcc -m32" \ 80 80 ./configure --prefix=/usr \ 81 --libdir= &usr-lib-m32;</userinput></screen>81 --libdir=/usr/lib32</userinput></screen> 82 82 83 83 <para>Compile the package:</para> … … 88 88 89 89 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 90 cp -Rv DESTDIR &usr-lib-m32;/* &usr-lib-m32;90 cp -Rv DESTDIR/usr/lib32/* /usr/lib32 91 91 rm -rf DESTDIR</userinput></screen> 92 92 … … 106 106 <screen><userinput remap="configure">CC="gcc -mx32" \ 107 107 ./configure --prefix=/usr \ 108 --libdir= &usr-lib-mx32;</userinput></screen>108 --libdir=/usr/libx32</userinput></screen> 109 109 110 110 <para>Compile the package:</para> … … 115 115 116 116 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install 117 cp -Rv DESTDIR &usr-lib-mx32;/* &usr-lib-mx32;117 cp -Rv DESTDIR/usr/libx32/* /usr/libx32 118 118 rm -rf DESTDIR</userinput></screen> 119 119 -
chapter08/zstd.xml
r51c01bff r0ebda11 78 78 79 79 <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.pc80 cp -Rv DESTDIR/usr/lib/* /usr/lib32/ 81 sed -e "/^libdir/s/lib$/lib32/" -i /usr/lib32/pkgconfig/libzstd.pc 82 82 rm -rf DESTDIR</userinput></screen> 83 83 … … 102 102 103 103 <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.pc104 cp -Rv DESTDIR/usr/lib/* /usr/libx32/ 105 sed -e "/^libdir/s/lib$/libx32/" -i /usr/libx32/pkgconfig/libzstd.pc 106 106 rm -rf DESTDIR</userinput></screen> 107 107 -
general.ent
r51c01bff r0ebda11 64 64 <!ENTITY % patches-entities SYSTEM "patches.ent"> 65 65 %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.