mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-02-07 06:41:59 +00:00
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
This commit is contained in:
commit
cadbe55e4d
@ -76,6 +76,7 @@
|
|||||||
<screen><userinput remap="configure">./configure --prefix=/usr \
|
<screen><userinput remap="configure">./configure --prefix=/usr \
|
||||||
--with-tcl=/usr/lib \
|
--with-tcl=/usr/lib \
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
|
--disable-rpath \
|
||||||
--mandir=/usr/share/man \
|
--mandir=/usr/share/man \
|
||||||
--with-tclinclude=/usr/include</userinput></screen>
|
--with-tclinclude=/usr/include</userinput></screen>
|
||||||
|
|
||||||
|
@ -49,6 +49,13 @@
|
|||||||
<screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
|
<screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
|
||||||
sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
|
sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
|
||||||
|
|
||||||
|
<para>Prevent hard coding library search paths (rpath) into
|
||||||
|
the shared libraries. This package does not need rpath for an
|
||||||
|
installation into the standard location, and rpath may sometimes cause
|
||||||
|
unwanted effects or even security issues:</para>
|
||||||
|
|
||||||
|
<screen><userinput>sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf</userinput></screen>
|
||||||
|
|
||||||
<para>Now fix a problem identified upstream:</para>
|
<para>Now fix a problem identified upstream:</para>
|
||||||
|
|
||||||
<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
|
<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
|
||||||
|
@ -47,28 +47,7 @@
|
|||||||
|
|
||||||
<screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
|
<screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
|
||||||
-e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
|
-e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
|
||||||
<!--
|
|
||||||
<para>Next, fix compatibility with linux-6.9 and later:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">sed -i '/DEVMEM_MAGIC 0/{n;n;a \
|
|
||||||
/* cb12fd8e0dabb9a1c8aef55a6a41e2c255fcdf4b (6.8) */
|
|
||||||
#ifndef PID_FS_MAGIC \
|
|
||||||
#define PID_FS_MAGIC 0x50494446 \
|
|
||||||
#endif
|
|
||||||
}' src/basic/missing_magic.h
|
|
||||||
|
|
||||||
sed -i '/OVERLAYFS_SUPER_MAGIC/a \
|
|
||||||
pidfs, {PID_FS_MAGIC}' src/basic/filesystems-gperf.gperf</userinput></screen>
|
|
||||||
-->
|
|
||||||
<!-- https://github.com/systemd/systemd/pull/30549 -->
|
|
||||||
<!--
|
|
||||||
<para>Now fix a security vulnerability in the DNSSEC verification of
|
|
||||||
<command>systemd-resolved</command> and a bug breaking running
|
|
||||||
<command>systemd-analyze verify</command> on an instantiated systemd
|
|
||||||
unit:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap='pre'>patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
|
|
||||||
-->
|
|
||||||
<para>Prepare systemd for compilation:</para>
|
<para>Prepare systemd for compilation:</para>
|
||||||
|
|
||||||
<screen><userinput remap="configure">mkdir -p build
|
<screen><userinput remap="configure">mkdir -p build
|
||||||
|
@ -55,7 +55,23 @@
|
|||||||
<screen><userinput remap="configure">SRCDIR=$(pwd)
|
<screen><userinput remap="configure">SRCDIR=$(pwd)
|
||||||
cd unix
|
cd unix
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--mandir=/usr/share/man</userinput></screen>
|
--mandir=/usr/share/man \
|
||||||
|
--disable-rpath</userinput></screen>
|
||||||
|
|
||||||
|
<variablelist>
|
||||||
|
<title>The meaning of the new configure parameters:</title>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><parameter>--disable-rpath</parameter></term>
|
||||||
|
<listitem>
|
||||||
|
<para>This parameter prevents hard coding library search paths
|
||||||
|
(rpath) into the binary executable files and shared libraries.
|
||||||
|
This package does not need rpath for an installation into the
|
||||||
|
standard location, and rpath may sometimes cause unwanted effects
|
||||||
|
or even security issues.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
</variablelist>
|
||||||
|
|
||||||
<para>Build the package:</para>
|
<para>Build the package:</para>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user