From e10c09cb3b62d5cfda150a29d8ce36c614927026 Mon Sep 17 00:00:00 2001
From: Mid Favila <midfavila@sdf.org>
Date: Tue, 23 Aug 2022 16:40:30 -0400
Subject: [PATCH] Begin work on statically linked core.

---
 NR_NOTES                                      |  5 +++
 NR_README                                     |  4 +++
 ports/official/core/axel/build                |  2 ++
 ports/official/core/binutils/build            |  9 ++++--
 ports/official/core/bison/build               |  3 ++
 ports/official/core/bzip2/build               | 32 +++++++++++++------
 ports/official/core/eudev/build               |  3 +-
 ports/official/core/expat/build               |  4 ++-
 ports/official/core/flex/build                |  8 +++++
 ports/official/core/gavin-bc/build            |  4 +--
 ports/official/core/gcc/build                 | 12 +++----
 ports/official/core/libz/build                |  1 +
 ports/official/core/mandoc/build              |  1 +
 ports/official/core/netbsd-curses/build       |  2 +-
 ports/official/core/perl/build                |  2 +-
 ports/official/core/sbase/build               |  2 +-
 ports/official/core/util-linux/build          | 22 +++++++++----
 ports/unofficial/rolling/mp-utils-git/build   |  5 +++
 ports/unofficial/rolling/mp-utils-git/sources |  2 ++
 ports/unofficial/rolling/mp-utils-git/version |  1 +
 ports/unofficial/rolling/nebula-git/build     |  6 ++++
 ports/unofficial/rolling/nebula-git/checksums |  1 +
 ports/unofficial/rolling/nebula-git/depends   |  2 ++
 ports/unofficial/rolling/nebula-git/sources   |  1 +
 ports/unofficial/rolling/nebula-git/version   |  1 +
 ports/unofficial/rolling/tcc-git/build        |  5 ++-
 ports/unofficial/stable/browser/checksums     |  2 +-
 ports/unofficial/stable/browser/sources       |  4 +--
 ports/unofficial/stable/nebula/build          |  7 ++++
 ports/unofficial/stable/nebula/checksums      |  1 +
 ports/unofficial/stable/nebula/sources        |  1 +
 ports/unofficial/stable/nebula/version        |  1 +
 32 files changed, 119 insertions(+), 37 deletions(-)
 create mode 100755 ports/unofficial/rolling/mp-utils-git/build
 create mode 100644 ports/unofficial/rolling/mp-utils-git/sources
 create mode 100644 ports/unofficial/rolling/mp-utils-git/version
 create mode 100755 ports/unofficial/rolling/nebula-git/build
 create mode 100644 ports/unofficial/rolling/nebula-git/checksums
 create mode 100644 ports/unofficial/rolling/nebula-git/depends
 create mode 100644 ports/unofficial/rolling/nebula-git/sources
 create mode 100644 ports/unofficial/rolling/nebula-git/version
 create mode 100755 ports/unofficial/stable/nebula/build
 create mode 100644 ports/unofficial/stable/nebula/checksums
 create mode 100644 ports/unofficial/stable/nebula/sources
 create mode 100644 ports/unofficial/stable/nebula/version

diff --git a/NR_NOTES b/NR_NOTES
index abd7f8d..44972e0 100644
--- a/NR_NOTES
+++ b/NR_NOTES
@@ -1 +1,6 @@
 -get python to build without GNU-compatible grep?
+-get everything under core/ to build statically?
+    -anything that relies on libz is an issue, it seems
+    -binutils is an issue
+    -so is eudev
+    -flex
diff --git a/NR_README b/NR_README
index 32edeb7..17fdbc7 100644
--- a/NR_README
+++ b/NR_README
@@ -68,6 +68,10 @@ microarchitecture using the following CFLAGS (assuming GCC):
    -Wl,--hash-style=gnu -Wl,-pie
       Linker arguments
 
+   -fno-lto
+      Prevent LTO. You can discard this if and only if you are not using
+      a statically-linked gold or bfd as your primary linker. 
+
 A new subdir, bin, containing binaries built with the above CFLAGS (sans native)
 will be added in the future. I, however, encourage you to build from source if
 possible.
diff --git a/ports/official/core/axel/build b/ports/official/core/axel/build
index afc5f0d..b5da4c1 100755
--- a/ports/official/core/axel/build
+++ b/ports/official/core/axel/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+CFLAGS="$CFLAGS -static "
+
 ./configure                      \
    --prefix=/usr                 \
    --disable-nls                 \
diff --git a/ports/official/core/binutils/build b/ports/official/core/binutils/build
index aa11a5a..84e50f5 100755
--- a/ports/official/core/binutils/build
+++ b/ports/official/core/binutils/build
@@ -1,5 +1,8 @@
 #!/bin/sh -e
 
+CFLAGS="$CFLAGS -static -fPIC"
+LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin -static -fPIC"
+
 cat > makeinfo <<EOF
 #!/bin/sh
 printf 'makeinfo (GNU texinfo) 5.2\n'
@@ -15,15 +18,17 @@ export PATH=$PATH:$PWD
     --enable-deterministic-archives \
     --enable-gold \
     --enable-ld=default \
-    --enable-plugins \
     --disable-multilib \
+    --with-static-standard-libraries \
     --disable-werror \
     --disable-gdb \
     --disable-nls \
     --disable-readline \
     --disable-gprof \
     --with-mmap \
-    --with-system-zlib
+    --with-system-zlib \
+    --disable-lto \
+    --disable-plugins 
 
 make configure-host
 make tooldir=/usr
diff --git a/ports/official/core/bison/build b/ports/official/core/bison/build
index 43d68f3..38ed9b6 100755
--- a/ports/official/core/bison/build
+++ b/ports/official/core/bison/build
@@ -1,5 +1,8 @@
 #!/bin/sh -e
 
+CFLAGS="$CFLAGS -static"
+LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin -static"
+
 # Parallel builds seem to break bison
 MAKEFLAGS=-j1
 
diff --git a/ports/official/core/bzip2/build b/ports/official/core/bzip2/build
index ac1055b..b69f30d 100755
--- a/ports/official/core/bzip2/build
+++ b/ports/official/core/bzip2/build
@@ -1,20 +1,34 @@
 #!/bin/sh -e
 
-make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" -f Makefile-libbz2_so
-make CC="${CC:-cc} $CFLAGS -fPIC $LDFLAGS" bzip2recover libbz2.a
+CFLAGS="$CFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin"
+LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin"
 
-for bin in bzip2-shared bzdiff bzgrep bzip2recover bzmore; do
-    install -Dm755 "$bin" "$1/usr/bin/${bin%%-shared}"
+sed -i 's/CFLAGS=.*//' Makefile
+sed -i 's/$(CFLAGS)/$(BIGFILES) $(LDFLAGS) $(CFLAGS)/g' Makefile
+sed -i 's^$(PREFIX)^/$(DESTDIR)/$(PREFIX)^g' Makefile
+sed -i s'^$(CC)^$(CC) $(LDFLAGS) $(CFLAGS)^g' Makefile-libbz2_so
+sed -i 's/CFLAGS=.*//' Makefile-libbz2_so
+
+make
+# this is a temporary fix until we figure out what causes the shared object build to break
+CFLAGS='-O2 -w -pipe -fPIC'
+LDFLAGS='-fno-use-linker-plugin -fPIC'
+make -f Makefile-libbz2_so
+
+ln -sf bzip2 bunzip2
+ln -sf bzip2 bzcat
+for lib in libbz2.so libbz2.so.1 libbz2.so.1.0
+do
+    ln -sf libbz2.so.1.0.8 $lib
 done
 
+make DESTDIR="$1" PREFIX=/usr install
 install -Dm755 libbz2.so.1.0.8 "$1/usr/lib/libbz2.so.1.0.8"
-install -Dm644 libbz2.a        "$1/usr/lib/libbz2.a"
 install -Dm644 bzip2.1         "$1/usr/share/man/man1/bzip2.1"
 install -Dm644 bzlib.h         "$1/usr/include/bzlib.h"
 
-for lib in libbz2.so libbz2.so.1 libbz2.so.1.0; do
+for lib in libbz2.so libbz2.so.1 libbz2.so.1.0
+do 
     ln -sf libbz2.so.1.0.8 "$1/usr/lib/$lib"
 done
-
-ln -sf bzip2 "$1/usr/bin/bunzip2"
-ln -sf bzip2 "$1/usr/bin/bzcat"
+ls
diff --git a/ports/official/core/eudev/build b/ports/official/core/eudev/build
index ce1ab87..cbb2457 100755
--- a/ports/official/core/eudev/build
+++ b/ports/official/core/eudev/build
@@ -5,8 +5,9 @@
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
     --bindir=/usr/bin \
+    --enable-fast-install \
+    --enable-static \
     --enable-hwdb \
-    --enable-blkid=auto \
     --disable-introspection
 
 make
diff --git a/ports/official/core/expat/build b/ports/official/core/expat/build
index 6daf22f..b8e49ec 100755
--- a/ports/official/core/expat/build
+++ b/ports/official/core/expat/build
@@ -1,7 +1,9 @@
 #!/bin/sh -e
 
 ./configure \
-    --prefix=/usr
+    --prefix=/usr \
+    --enable-shared \
+    --enable-static
 
 make
 make DESTDIR="$1" install
diff --git a/ports/official/core/flex/build b/ports/official/core/flex/build
index 2a1bda0..8749b60 100755
--- a/ports/official/core/flex/build
+++ b/ports/official/core/flex/build
@@ -6,6 +6,14 @@
     ac_cv_func_realloc_0_nonnull=yes
 
 make
+
+# We need to work around flex's makefile not working with static directives.
+
+obj=flex-"buf.o flex-ccl.o flex-dfa.o flex-ecs.o flex-filter.o flex-gen.o flex-main.o flex-misc.o flex-nfa.o flex-options.o flex-parse.o flex-regex.o flex-scanflags.o flex-scanopt.o flex-skel.o flex-sym.o flex-tables.o flex-tables_shared.o flex-tblcmp.o flex-yylex.o flex-stage1scan.o"
+cd src/
+$CC $CFLAGS $LDFLAGS -o flex $obj -lintl -lm
+cd ..
+
 make DESTDIR="$1" install
 
 ln -s flex "$1/usr/bin/lex"
diff --git a/ports/official/core/gavin-bc/build b/ports/official/core/gavin-bc/build
index 4798da9..bf85ae5 100755
--- a/ports/official/core/gavin-bc/build
+++ b/ports/official/core/gavin-bc/build
@@ -2,9 +2,7 @@
 
 ./configure      \
     --prefix=/usr \
-    --disable-nls \
-    --disable-generated-tests \
-    --enable-memcheck 
 
 make
 make DESTDIR="$1" install
+install -Dm755 bin/bc "$1/usr/bin/bc"
diff --git a/ports/official/core/gcc/build b/ports/official/core/gcc/build
index aecae67..41d2a43 100755
--- a/ports/official/core/gcc/build
+++ b/ports/official/core/gcc/build
@@ -1,4 +1,9 @@
 #!/bin/sh -e
+
+CFLAGS="$CFLAGS -static -fPIC"
+CXXFLAGS=$CFLAGS
+LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin -static -fPIC"
+
 cd gcc
 patch -p1 < ../musl-jit.patch
 cd ../
@@ -71,10 +76,3 @@ ln -s gcc "$1/usr/bin/cc"
 # POSIX compliance.
 install -Dm755 ../c99 "$1/usr/bin/c99"
 
-# Symlink for LTO.
-#{
-#    mkdir -p "$1/usr/lib/bfd-plugins"
-#
-#    ln -s "/usr/lib/gcc/x86_64-pc-linux-musl/$2/liblto_plugin.so" \
-#          "$1/usr/lib/bfd-plugins/liblto_plugin.so"
-#}
diff --git a/ports/official/core/libz/build b/ports/official/core/libz/build
index d733d4f..d9c726c 100755
--- a/ports/official/core/libz/build
+++ b/ports/official/core/libz/build
@@ -5,6 +5,7 @@ export CFLAGS="$CFLAGS -fPIC"
 ./configure \
     --prefix=/usr \
     --libdir=/usr/lib \
+    --enable-static
 
 make
 make DESTDIR="$1" install
diff --git a/ports/official/core/mandoc/build b/ports/official/core/mandoc/build
index 2e1744a..fbc4137 100755
--- a/ports/official/core/mandoc/build
+++ b/ports/official/core/mandoc/build
@@ -12,6 +12,7 @@ SBINDIR=/usr/bin
 CC="${CC:-cc}"
 CFLAGS="$CFLAGS"
 LN="ln -sf"
+STATIC="-static -fno-lto -fno-use-linker-plugin"
 EOF
 
 ./configure
diff --git a/ports/official/core/netbsd-curses/build b/ports/official/core/netbsd-curses/build
index 19fe62e..5264e54 100755
--- a/ports/official/core/netbsd-curses/build
+++ b/ports/official/core/netbsd-curses/build
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin"
 make DESTDIR="$1" PREFIX=/usr install
diff --git a/ports/official/core/perl/build b/ports/official/core/perl/build
index 8f369e2..35854fc 100755
--- a/ports/official/core/perl/build
+++ b/ports/official/core/perl/build
@@ -2,7 +2,7 @@
 
 export BUILD_ZLIB=0
 export BUILD_BZIP2=0
-export LDFLAGS="$LDFLAGS -pthread"
+export LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin -pthread"
 export CFLAGS="$CFLAGS -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"
 
 ./Configure \
diff --git a/ports/official/core/sbase/build b/ports/official/core/sbase/build
index 81065ca..13760b3 100755
--- a/ports/official/core/sbase/build
+++ b/ports/official/core/sbase/build
@@ -3,7 +3,7 @@
 # Install our pre-configured Makefile.
 cp makefile.mid ./Makefile
 
-make LDFLAGS="$LDFLAGS -static"
+make LDFLAGS="$LDFLAGS -static -fPIC -fno-lto -fno-use-linker-plugin -static"
 make DESTDIR="$1" PREFIX=/usr install
 
 echo '#!/bin/sh
diff --git a/ports/official/core/util-linux/build b/ports/official/core/util-linux/build
index 1af2b12..c159117 100755
--- a/ports/official/core/util-linux/build
+++ b/ports/official/core/util-linux/build
@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
+CFLAGS="$(echo $CFLAGS|sed 's/-static//g')"
+LDFLAGS="$(echo $LDFLAGS|sed 's/-static//g')"
+
+
 ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -12,21 +16,25 @@
     --without-python \
     --without-systemd \
     --disable-all-programs \
-    --enable-static-programs=fdisk,mount,umount \
+    --enable-static-programs=fdisk,mount,umount,ul,fsck,uuidgen,fstrim \
+    --enable-fdisks \
+    --enable-mount \
+    --enable-umount \
+    --enable-fsck \
+    --enable-uuidgen \
+    --enable-fstrim \
     --enable-libuuid \
     --enable-libblkid \
     --enable-libfdisk \
     --enable-libsmartcols \
-    --enable-fsck \
-    --enable-uuidgen \
-    --enable-fstrim\
     --enable-libmount \
     --enable-fdisks \
-    --enable-mount \
-    --enable-getopt \
+    --enable-ul \
     --disable-bash-completion \
     --disable-colors-default \
-    --disable-nls
+    --enable-shared=libblkid \
+    --disable-nls \
+--prefix=/usr --disable-rpath --without-udev --without-python --without-systemd --disable-all-programs --enable-static-programs=fdisk,mount,umount,ul,fsck,uuiden,fstrim --enable-libuuid --enable-libblkid --enable-libfdisk --enable-libsmartcols --enable-libmount --disable-bash-completion --disable-colors-default --enable-shared
 
 
 make
diff --git a/ports/unofficial/rolling/mp-utils-git/build b/ports/unofficial/rolling/mp-utils-git/build
new file mode 100755
index 0000000..7d5931c
--- /dev/null
+++ b/ports/unofficial/rolling/mp-utils-git/build
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+cd src
+
+make PREFIX="/usr/" DESTDIR="$1" install
diff --git a/ports/unofficial/rolling/mp-utils-git/sources b/ports/unofficial/rolling/mp-utils-git/sources
new file mode 100644
index 0000000..7846010
--- /dev/null
+++ b/ports/unofficial/rolling/mp-utils-git/sources
@@ -0,0 +1,2 @@
+git+https://git.sdf.org/midfavila/mp-utils
+
diff --git a/ports/unofficial/rolling/mp-utils-git/version b/ports/unofficial/rolling/mp-utils-git/version
new file mode 100644
index 0000000..a383ea1
--- /dev/null
+++ b/ports/unofficial/rolling/mp-utils-git/version
@@ -0,0 +1 @@
+git 1
diff --git a/ports/unofficial/rolling/nebula-git/build b/ports/unofficial/rolling/nebula-git/build
new file mode 100755
index 0000000..2726837
--- /dev/null
+++ b/ports/unofficial/rolling/nebula-git/build
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+cd src
+
+make
+make DESTDIR="$1" PREFIX="/usr" install
diff --git a/ports/unofficial/rolling/nebula-git/checksums b/ports/unofficial/rolling/nebula-git/checksums
new file mode 100644
index 0000000..e2e45cf
--- /dev/null
+++ b/ports/unofficial/rolling/nebula-git/checksums
@@ -0,0 +1 @@
+077f0ee97a578523df1d06a50586bc2dd8e5edde878db7c05f80521afa57a558
diff --git a/ports/unofficial/rolling/nebula-git/depends b/ports/unofficial/rolling/nebula-git/depends
new file mode 100644
index 0000000..cad377e
--- /dev/null
+++ b/ports/unofficial/rolling/nebula-git/depends
@@ -0,0 +1,2 @@
+libXt
+motif
diff --git a/ports/unofficial/rolling/nebula-git/sources b/ports/unofficial/rolling/nebula-git/sources
new file mode 100644
index 0000000..2673ee9
--- /dev/null
+++ b/ports/unofficial/rolling/nebula-git/sources
@@ -0,0 +1 @@
+git+https://git.sdf.org/midfavila/Nebula
diff --git a/ports/unofficial/rolling/nebula-git/version b/ports/unofficial/rolling/nebula-git/version
new file mode 100644
index 0000000..4c189d3
--- /dev/null
+++ b/ports/unofficial/rolling/nebula-git/version
@@ -0,0 +1 @@
+0.5 1
diff --git a/ports/unofficial/rolling/tcc-git/build b/ports/unofficial/rolling/tcc-git/build
index 9703991..43195a3 100755
--- a/ports/unofficial/rolling/tcc-git/build
+++ b/ports/unofficial/rolling/tcc-git/build
@@ -3,7 +3,10 @@
 ./configure \
     --prefix=/usr \
     --cc="${CC:-cc}" \
-    --config-musl
+    --config-musl \
+    --enable-static
+
+sed -i 's/-DC2STR/${CFLAGS} ${LDFLAGS} -DC2STR/g' Makefile
 
 make
 make DESTDIR="$1" install
diff --git a/ports/unofficial/stable/browser/checksums b/ports/unofficial/stable/browser/checksums
index bf34497..0fbfef0 100644
--- a/ports/unofficial/stable/browser/checksums
+++ b/ports/unofficial/stable/browser/checksums
@@ -1,4 +1,4 @@
-5d81f24fdc7cdb000d6ed5762459eda842b0b1f43fdad3a4be5e8edd5c8f7079
+34ba2b78b640f8ff1eb8137bb87a24ab5452eddc0b42fa908e4d5a1a898cfdac
 4bf732b952a121baedc79b07eb54ba6f37a146e8c497be73fb71ca34aeb90860
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
 578146940874f8884f5ec69da948538dbd428de9405717ca24e6d5d80c7eb381
diff --git a/ports/unofficial/stable/browser/sources b/ports/unofficial/stable/browser/sources
index 5db5397..f86fb30 100644
--- a/ports/unofficial/stable/browser/sources
+++ b/ports/unofficial/stable/browser/sources
@@ -1,5 +1,5 @@
-https://fossies.org/linux/www/palemoon-29.4.4.source.tar.xz
-https://repo.palemoon.org/MoonchildProductions/UXP/archive/RELBASE_20210608.tar.gz platform/
+https://fossies.org/linux/www/palemoon-29.4.6.source.tar.xz
+https://repo.palemoon.org/MoonchildProductions/UXP/archive/RELBASE_20210608.tar.gz
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 files/mozconfig.in
 patches/gcc11-fix.patch
diff --git a/ports/unofficial/stable/nebula/build b/ports/unofficial/stable/nebula/build
new file mode 100755
index 0000000..6daf22f
--- /dev/null
+++ b/ports/unofficial/stable/nebula/build
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+./configure \
+    --prefix=/usr
+
+make
+make DESTDIR="$1" install
diff --git a/ports/unofficial/stable/nebula/checksums b/ports/unofficial/stable/nebula/checksums
new file mode 100644
index 0000000..e2e45cf
--- /dev/null
+++ b/ports/unofficial/stable/nebula/checksums
@@ -0,0 +1 @@
+077f0ee97a578523df1d06a50586bc2dd8e5edde878db7c05f80521afa57a558
diff --git a/ports/unofficial/stable/nebula/sources b/ports/unofficial/stable/nebula/sources
new file mode 100644
index 0000000..8ae12a1
--- /dev/null
+++ b/ports/unofficial/stable/nebula/sources
@@ -0,0 +1 @@
+https://downloads.sourceforge.net/project/nebula-irc/nebula-irc/0.5/nebula-0.5.tar.gz
diff --git a/ports/unofficial/stable/nebula/version b/ports/unofficial/stable/nebula/version
new file mode 100644
index 0000000..4c189d3
--- /dev/null
+++ b/ports/unofficial/stable/nebula/version
@@ -0,0 +1 @@
+0.5 1