Ignore:
Timestamp:
04/01/2019 05:00:45 PM (5 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
Children:
7d9f881
Parents:
1fa2099
Message:

First apply of multilib-patch of April 1st, 2019

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11566 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:
1 edited

Legend:

Unmodified
Added
Removed

  • chapter06/systemd.xml

    r1fa2099 r8eb3fe4  
    208208EOF
    209209chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
     210
     211  </sect2>
     212
     213<!-- ====== 32-bit ===== -->
     214
     215  <sect2 arch="multilib" role="installation">
     216    <title>Installation of systemd - 32-bit</title>
     217
     218    <para>If still in the build directory, step out:</para>
     219<screen><userinput remap="pre">cd ..</userinput></screen>
     220
     221    <para>Clean previous build:</para>
     222
     223<screen><userinput remap="pre">rm -rf build</userinput></screen>
     224
     225    <para>Create a symlink to work around missing xsltproc:</para>
     226
     227<screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
     228
     229    <para>Because we have not yet installed the final version of Util-Linux,
     230    create links to the libraries in the approprite location:</para>
     231
     232<screen><userinput remap="pre">for file in /tools/lib32/lib{blkid,mount,uuid}*; do
     233    ln -sf $file /usr/lib32/
     234done</userinput></screen>
     235
     236    <para>Set up the man pages:</para>
     237
     238<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
     239
     240    <para>Prepare systemd for compilation:</para>
     241
     242    <screen><userinput remap="configure">cd build
     243PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/tools/lib32/pkgconfig" \
     244CC="gcc -m32 -march=i686"              \
     245CXX="g++ -m32 -march=i686"             \
     246LANG=en_US.UTF-8                       \
     247meson --prefix=/usr                    \
     248      --sysconfdir=/etc                \
     249      --localstatedir=/var             \
     250      -Dblkid=true                     \
     251      -Dbuildtype=release              \
     252      -Ddefault-dnssec=no              \
     253      -Dfirstboot=false                \
     254      -Dinstall-tests=false            \
     255      -Dkill-path=/bin/kill            \
     256      -Dkmod-path=/bin/kmod            \
     257      -Dldconfig=false                 \
     258      -Dmount-path=/bin/mount          \
     259      -Drootprefix=                    \
     260      -Drootlibdir=/usr/lib32          \
     261      -Dsplit-usr=true                 \
     262      -Dsulogin-path=/sbin/sulogin     \
     263      -Dsysusers=false                 \
     264      -Dumount-path=/bin/umount        \
     265      -Db_lto=false                    \
     266      ..</userinput></screen>
     267
     268    <para>Compile the package:</para>
     269
     270<screen><userinput remap="make">LANG=en_US.UTF-8 ninja</userinput></screen>
     271
     272    <para>Install the package:</para>
     273
     274<screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
     275cp -Rv DESTDIR/usr/lib32/* /usr/lib32
     276rm -rf DESTDIR
     277rm -f /usr/bin/xsltproc</userinput></screen>
     278
     279  </sect2>
     280
     281<!-- ====== x32-bit ===== -->
     282
     283  <sect2 arch="multilib" role="installation">
     284    <title>Installation of systemd - x32-bit</title>
     285
     286    <para>If still in the build directory, step out:</para>
     287<screen><userinput remap="pre">cd ..</userinput></screen>
     288
     289    <para>Clean previous build:</para>
     290
     291<screen><userinput remap="pre">rm -rf build</userinput></screen>
     292
     293    <para>Create a symlink to work around missing xsltproc:</para>
     294
     295<screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
     296
     297    <para>Because we have not yet installed the final version of Util-Linux,
     298    create links to the libraries in the approprite location:</para>
     299
     300<screen><userinput remap="pre">for file in /tools/libx32/lib{blkid,mount,uuid}*; do
     301    ln -sf $file /usr/libx32/
     302done</userinput></screen>
     303
     304    <para>Set up the man pages:</para>
     305
     306<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
     307
     308    <para>Fix an issue on x32:</para>
     309
     310<screen><userinput remap="pre">sed '/log_debug/s@PRI_TIMEX@PRIi64@' -i src/timesync/timesyncd-manager.c
     311sed '/long drift_freq;/s@long @int64_t @' -i src/timesync/timesyncd-manager.h</userinput></screen>
     312
     313    <para>Prepare systemd for compilation:</para>
     314
     315<screen><userinput remap="configure">cd build
     316PKG_CONFIG_PATH="/tools/libx32/pkgconfig:/usr/libx32/pkgconfig" \
     317CC="gcc -mx32"                          \
     318CXX="g++ -mx32"                         \
     319CFLAGS+="-Wno-error=shift-overflow"     \
     320CXXFLAGS+="-Wno-error=shift-overflow"   \
     321LANG=en_US.UTF-8                        \
     322meson --prefix=/usr                     \
     323      --sysconfdir=/etc                 \
     324      --localstatedir=/var              \
     325      -Dblkid=true                      \
     326      -Dbuildtype=release               \
     327      -Ddefault-dnssec=no               \
     328      -Dfirstboot=false                 \
     329      -Dinstall-tests=false             \
     330      -Dkill-path=/bin/kill             \
     331      -Dkmod-path=/bin/kmod             \
     332      -Dldconfig=false                  \
     333      -Dmount-path=/bin/mount           \
     334      -Drootprefix=                     \
     335      -Drootlibdir=/usr/libx32          \
     336      -Dsplit-usr=true                  \
     337      -Dsulogin-path=/sbin/sulogin      \
     338      -Dsysusers=false                  \
     339      -Dumount-path=/bin/umount         \
     340      -Db_lto=false                     \
     341      ..</userinput></screen>
     342
     343    <para>Compile the package:</para>
     344
     345<screen><userinput remap="make">LANG=en_US.UTF-8 ninja</userinput></screen>
     346
     347    <para>Install the package:</para>
     348
     349<screen><userinput remap="install">LANG=en_US.UTF-8 DESTDIR=$PWD/DESTDIR ninja install
     350cp -Rv DESTDIR/usr/libx32/* /usr/libx32
     351rm -rf DESTDIR
     352rm -f /usr/bin/xsltproc</userinput></screen>
    210353
    211354  </sect2>
Note: See TracChangeset for help on using the changeset viewer.