Changeset 96e0c171

Timestamp:

11/19/2023 11:01:36 PM (6 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

331efa7

Parents:

9bfa685

Message:

mozilla: Drop SHELL=/bin/bash

Note that if you build something relying on $SHELL, it may still fail to
build in chroot.

In the chroot we first use "env -i" to clean the environment variables.
When bash starts with no $SHELL set, it *sets* SHELL=(the login shell
of current user specified in /etc/passwd), but it *does not export this
variable*.

For example:

$ cat > t.c << EOF
#include <stdio.h>
#include <stdlib.h>
int main() { puts (getenv ("SHELL") ?: "(nullptr)"); }
$ ./a.out
/bin/zsh/
$ cc t.c
$ env -i bash -c "echo $SHELL"
/bin/zsh
$ env -i bash -c "./a.out"
(nullptr)

We can remove this now only because Mozilla has added a workaround into
their building system at
​https://hg.mozilla.org/mozilla-central/rev/5afe7b911f61 for some Mac
builder, inadvertently fixing our issue.

Link: ​https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2014-11/msg00050.html
Link: ​https://lists.linuxfromscratch.org/sympa/arc/blfs-dev/2023-11/msg00136.html

Files:

• general/genlib/spidermonkey.xml (modified) (1 diff)
• xincludes/mozconfigure.xml (deleted)
• xincludes/mozmach.xml (deleted)
• xincludes/mozshm.xml (modified) (2 diffs)
• xsoft/graphweb/firefox.xml (modified) (1 diff)
• xsoft/graphweb/seamonkey.xml (modified) (1 diff)
• xsoft/other/thunderbird.xml (modified) (1 diff)

general/genlib/spidermonkey.xml

@@ -170 +170 @@
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
          href="../../xincludes/mozshm.xml"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-         href="../../xincludes/mozconfigure.xml"/>
-
       <para>
         Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',

xincludes/mozshm.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;]>
 
 
@@ -7 +9 @@
          mounted when configured or similar in chroot.
          Unfortunately, the DTD says an xinclude can only include
-         one paragraph. -->
+         one paragraph.
+
+         We now have exactly one paragraph, git blame this line for
+         details.                                             -->
 
     <para>
-      If you are compiling this package in chroot you must do two things.
-      First, as the <systemitem class="username">root</systemitem> user,
+      If you are compiling this package in chroot you must
       ensure that <filename>/dev/shm</filename> is mounted. If you do not
       do this, the <application>Python</application> configuration will fail
       with a traceback report referencing
       <filename>/usr/lib/pythonN.N/multiprocessing/synchronize.py</filename>.
-      Run:
+      As the &root; user, run:
 
 <screen role="nodump"><userinput>mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm</userinput></screen>
 
     </para>
-    <!-- follow with appropriate text about exporting SHELL -->

xsoft/graphweb/firefox.xml

@@ -398 +398 @@
 
     <note>
-
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
        href="../../xincludes/mozshm.xml"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozmach.xml"/>
-
     </note>
 

xsoft/graphweb/seamonkey.xml

@@ -267 +267 @@
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
        href="../../xincludes/mozshm.xml"/>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-       href="../../xincludes/mozmach.xml"/>
     </note>
 

xsoft/other/thunderbird.xml

@@ -255 +255 @@
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
        href="../../xincludes/mozshm.xml"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/mozmach.xml"/>
-
     </note>