Automatic merge of trunk into multilib

chapter08/libffi.xml

@@ -55,7 +55,7 @@
     <screen><userinput remap="configure">./configure --prefix=/usr          \
             --disable-static       \
             --with-gcc-arch=native \
-            --disable-exec-static-tramp </userinput></screen>
+            --disable-exec-static-tramp</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
@@ -74,6 +74,19 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <!-- To editors: remove it when downstreams are properly
+                         fixed. -->
+        <term><parameter>--disable-exec-static-tramp</parameter></term>
+        <listitem>
+          <para>Disable static trampoline support.  It's a new security
+          feature in libffi, but some BLFS packages (notably
+          <application>GJS</application> and
+          <application>gobject-introspection</application>) have not been
+          adapted for it.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>