Replace NSS+NSPR package with separate NSS and NSPR packages from KISS Community.
This commit is contained in:
parent
34dd08f687
commit
dc2993c88f
|
|
@ -0,0 +1,75 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
# TODO Cleanup non-libgccjit items.
|
||||
|
||||
sys_arch=${3:-$(uname -m)}
|
||||
|
||||
sed_i() {
|
||||
for file; do :; done
|
||||
sed "$@" > _
|
||||
cat _ > "$file"
|
||||
rm -f _
|
||||
}
|
||||
|
||||
if [ "${sys_arch#i*86}" ]; then
|
||||
# Do not create lib64 directories
|
||||
sed_i '/m64=/s/lib64/lib/' gcc/gcc/config/i386/t-linux64
|
||||
sed_i 's/lib64/lib/' gcc/gcc/config/i386/linux64.h
|
||||
fi
|
||||
|
||||
# FIXME: there is an offset on the diff, causing 'busybox patch' to fail.
|
||||
(
|
||||
cd gcc
|
||||
patch -p1 < ../gccjit-musl-fix.patch
|
||||
)
|
||||
|
||||
case "$sys_arch" in
|
||||
i*86) archopts="--build=i686-pc-linux-musl" ;;
|
||||
x86_64) archopts="--build=x86_64-pc-linux-musl" ;;
|
||||
esac
|
||||
|
||||
# Build must happen outside of gcc source.
|
||||
mkdir -p gcc-build
|
||||
cd gcc-build
|
||||
|
||||
export libat_cv_have_ifunc=no
|
||||
|
||||
../gcc/configure \
|
||||
--prefix=/usr \
|
||||
"$archopts" \
|
||||
--disable-bootstrap \
|
||||
--disable-fixed-point \
|
||||
--disable-libada \
|
||||
--disable-libquadmath \
|
||||
--disable-libsanitizer \
|
||||
--disable-libssp \
|
||||
--disable-libvtv \
|
||||
--disable-lto \
|
||||
--disable-multilib \
|
||||
--disable-nls \
|
||||
--disable-symvers \
|
||||
--disable-werror \
|
||||
--enable-__cxa_atexit \
|
||||
--enable-checking=release \
|
||||
--enable-default-pie \
|
||||
--enable-default-ssp \
|
||||
--enable-host-shared \
|
||||
--enable-languages=jit \
|
||||
--enable-shared \
|
||||
--enable-threads \
|
||||
--enable-tls \
|
||||
--mandir=/usr/share/man \
|
||||
--with-system-zlib \
|
||||
--without-included-gettext
|
||||
|
||||
make
|
||||
make DESTDIR="$1" -C gcc install
|
||||
|
||||
# Remove unnecessary gcc files.
|
||||
rm -rf "$1/usr/bin" \
|
||||
"$1/usr/lib/gcc" \
|
||||
"$1/usr/libexec" \
|
||||
"$1/usr/share/man"
|
||||
|
||||
# Remove info pages other than libgccjit
|
||||
find "$1/usr/share/info" -type f ! -name libgccjit.info -exec rm -f {} +
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
|
||||
0485655dbccf9034ba1d2cf5fb2e7bdbfe10aee32906c9488c0ec3da69dbb44f
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
|
||||
index 5bccf591a..35f5e35ef 100644
|
||||
--- a/gcc/jit/jit-playback.c
|
||||
+++ b/gcc/jit/jit-playback.c
|
||||
@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING3. If not see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
+#include <pthread.h>
|
||||
+
|
||||
#include "config.h"
|
||||
#include "system.h"
|
||||
#include "coretypes.h"
|
||||
@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3. If not see
|
||||
#include "diagnostic.h"
|
||||
#include "stmt.h"
|
||||
|
||||
-#include <pthread.h>
|
||||
-
|
||||
#include "jit-playback.h"
|
||||
#include "jit-result.h"
|
||||
#include "jit-builtins.h"
|
||||
diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
|
||||
index a237d574f..5785e3269 100644
|
||||
--- a/gcc/jit/jit-recording.c
|
||||
+++ b/gcc/jit/jit-recording.c
|
||||
@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING3. If not see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
+#include <pthread.h>
|
||||
+
|
||||
#include "config.h"
|
||||
#include "system.h"
|
||||
#include "coretypes.h"
|
||||
@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3. If not see
|
||||
#include "pretty-print.h"
|
||||
#include "toplev.h"
|
||||
|
||||
-#include <pthread.h>
|
||||
-
|
||||
#include "jit-builtins.h"
|
||||
#include "jit-recording.h"
|
||||
#include "jit-playback.h"
|
||||
diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
|
||||
index f9c33c63c..75f21d275 100644
|
||||
--- a/gcc/jit/libgccjit.c
|
||||
+++ b/gcc/jit/libgccjit.c
|
||||
@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING3. If not see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
+#include <pthread.h>
|
||||
#include "config.h"
|
||||
#include "system.h"
|
||||
#include "coretypes.h"
|
||||
#include "timevar.h"
|
||||
#include "typed-splay-tree.h"
|
||||
#include "cppbuiltin.h"
|
||||
-#include <pthread.h>
|
||||
|
||||
#include "libgccjit.h"
|
||||
#include "jit-recording.h"
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
https://gcc.gnu.org/pub/gcc/releases/gcc-11.2.0/gcc-11.2.0.tar.xz gcc
|
||||
patches/gccjit-musl-fix.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
11.2.0 1
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
#!/bin/sh -e
|
||||
cd gcc
|
||||
patch -p1 < ../musl-jit.patch
|
||||
cd ../
|
||||
|
||||
# Make sure gmp is built with generic options.
|
||||
cp gcc/gmp/configfsf.guess gcc/gmp/config.guess
|
||||
|
|
@ -47,7 +50,7 @@ export libat_cv_have_ifunc=no
|
|||
--enable-host-shared \
|
||||
--enable-threads \
|
||||
--enable-tls \
|
||||
--enable-languages=c,c++ \
|
||||
--enable-languages=c,c++,jit \
|
||||
--without-included-gettext \
|
||||
--with-zstd=no \
|
||||
--with-system-zlib \
|
||||
|
|
|
|||
|
|
@ -18,3 +18,5 @@ for i in egrep fgrep
|
|||
do
|
||||
chmod +x "$1/usr/bin/$i"
|
||||
done
|
||||
|
||||
install -Dm700 cron.service "$1/var/sysmgr/"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
0df705dcc7589a6926d9349813285fe673fd2eece5a95bd0840f00b46f964e34
|
||||
7a5d22310bea3ac7eb99e8ba6482b50136bf4a5eb78f9359d6e9c012ea0cc306
|
||||
cad76f664e1af74c8a102cc9742cd8a130abc89b7a44da71e8cb1023c0c4da5c
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
#/bin/sh -e
|
||||
|
||||
exec cron -n >> /var/log/cron.log
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
https://git.sdf.org/midfavila/sbase/archive/rel0.tar.gz
|
||||
files/cron.service
|
||||
files/makefile.mid
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
./configure \
|
||||
--prefix=/usr
|
||||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
|
@ -0,0 +1 @@
|
|||
f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
https://www.x.org/releases/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
1.9.0 1
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
./configure \
|
||||
--prefix=/usr
|
||||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
|
@ -0,0 +1 @@
|
|||
f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
https://www.x.org/releases/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
1.9.2 1
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
patch -p1 < rootless-amdgpu.patch
|
||||
|
||||
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
|
||||
export CFLAGS="$(echo $CFLAGS|sed 's/-fno-plt//')"
|
||||
export CFLAGS="$CFLAGS -fcommon"
|
||||
|
||||
./configure \
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
bd809c59e3f887eb75c8ba9e0160a234a8cee87145771158907ad5ae2ec80b1a
|
||||
133ec56ebb576803ebb917c85506f7ad3e2e0fa6ca32ee7dd382bf513c8e5097
|
||||
c98ad9376f20ab25463ef74bb19f2dbe874a19918b27b430c8e632d272379129
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
https://x.org/releases/individual/xserver/xorg-server-21.1.1.tar.gz
|
||||
https://x.org/releases/individual/xserver/xorg-server-21.1.0.tar.gz
|
||||
patches/rootless_modesetting.patch
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
./autogen.sh
|
||||
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--with-modules \
|
||||
|
|
@ -10,7 +13,6 @@
|
|||
--without-gsettings \
|
||||
--with-xpm=yes \
|
||||
--with-gnutls=yes \
|
||||
--with-json=yes \
|
||||
--with-native-compilation
|
||||
|
||||
mkdir -p "$1/usr/share/emacs/site-lisp"
|
||||
|
|
@ -6,5 +6,5 @@ libpng
|
|||
libxml2
|
||||
netbsd-curses
|
||||
tiff
|
||||
|
||||
libgccjit
|
||||
libXpm
|
||||
|
|
@ -0,0 +1 @@
|
|||
git+git://git.sv.gnu.org/emacs.git
|
||||
|
|
@ -0,0 +1 @@
|
|||
git 1
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
autoreconf -fi
|
||||
|
||||
./configure \
|
||||
--prefix=/usr
|
||||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
libusb
|
||||
libudev-zero
|
||||
autoconf make
|
||||
automake make
|
||||
|
|
@ -0,0 +1 @@
|
|||
git+https://github.com/libusb/hidapi
|
||||
|
|
@ -0,0 +1 @@
|
|||
git 1
|
||||
|
|
@ -1 +1,2 @@
|
|||
pidgin
|
||||
nss
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
autoreconf -fi
|
||||
|
||||
./configure \
|
||||
--prefix=/usr
|
||||
|
||||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
||||
# Install documentation.
|
||||
for i in docs/*.html
|
||||
do
|
||||
install -Dm644 "${i}" "${1}/usr/share/docs/sctools/${i}"
|
||||
done
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
hidapi-git
|
||||
autoconf make
|
||||
automake make
|
||||
|
|
@ -0,0 +1 @@
|
|||
git+https://github.com/thentenaar/sctools
|
||||
|
|
@ -0,0 +1 @@
|
|||
git 1
|
||||
|
|
@ -7,3 +7,5 @@ autoreconf -fi
|
|||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
||||
install -Dm644 dict.conf "$1/usr/etc/"
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
c714b87056a3a78ecaeb70eaf86d526033fe688352222c9ada00f0f1c2b46ada
|
||||
26ac3d3eb42c000d9b22d5d075b320813c3c83f3b169ff0112358831b61f9ef0
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
server dict.org
|
||||
|
|
@ -1 +1,2 @@
|
|||
https://github.com/cheusov/dictd/archive/refs/tags/1.13.0.tar.gz
|
||||
https://github.com/cheusov/dict/archive/refs/tags/1.13.0.tar.gz
|
||||
files/dict.conf
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
https://ftp.gnu.org/gnu/emacs/emacs-27.2.tar.xz
|
||||
|
|
@ -1 +0,0 @@
|
|||
27.2 1
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
mkdir build inst
|
||||
|
||||
cd build
|
||||
CFLAGS="$CFLAGS -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 \
|
||||
-D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
|
||||
-D_PR_INET6_PROBE" \
|
||||
../nspr/configure \
|
||||
--prefix=/usr \
|
||||
--disable-debug \
|
||||
--enable-optimize \
|
||||
--enable-64bit
|
||||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
||||
# $1 is never unset
|
||||
# shellcheck disable=2115
|
||||
rm -rf \
|
||||
"$1/usr/lib/"*.a \
|
||||
"$1/usr/bin/prerr.properties" \
|
||||
"$1/usr/bin/compile-et.pl" \
|
||||
"$1/usr/share" \
|
||||
"$1/usr/include/nspr/md"
|
||||
|
|
@ -0,0 +1 @@
|
|||
b23ee315be0e50c2fb1aa374d17f2d2d9146a835b1a79c1918ea15d075a693d7
|
||||
|
|
@ -0,0 +1 @@
|
|||
https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.33/src/nspr-4.33.tar.gz
|
||||
|
|
@ -0,0 +1 @@
|
|||
4.33 1
|
||||
|
|
@ -4,34 +4,23 @@ export NSS_USE_SYSTEM_SQLITE=1
|
|||
export NSS_ENABLE_WERROR=0
|
||||
export USE_64=1
|
||||
export BUILD_OPT=1
|
||||
export NSS_DISABLE_DEPRECATED_SEED=1
|
||||
export NSS_DISABLE_DEPRECATED_RC2=1
|
||||
export NSPR_INCLUDE_DIR=/usr/include/nspr
|
||||
|
||||
export CC="${CC:-cc}"
|
||||
export CCC="${CXX:-c++}"
|
||||
export CXX="${CXX:-c++}"
|
||||
|
||||
make -j1 -C nss nss_build_all
|
||||
make -C nss all
|
||||
|
||||
# TODO: Maybe install the NSS binaries. They're uneeded
|
||||
# right now as we handle certs differently.
|
||||
#
|
||||
# TODO: Maybe install nss-config. Nothing uses it yet
|
||||
# and this build system is terrible so shhh.
|
||||
install -Dt "$1/usr/include/nss" -m644 dist/public/nss/*.h
|
||||
install -Dt "$1/usr/include/nss" -m644 dist/Linux*/include/*.h
|
||||
install -Dt "$1/usr/include/nss/private" -m644 \
|
||||
dist/private/nss/blapi.h dist/private/nss/alghmac.h
|
||||
install -Dt "$1/usr/lib" dist/Linux*/lib/*.so
|
||||
install -Dt "$1/usr/lib" -m644 dist/Linux*/lib/*.chk
|
||||
|
||||
# Yucky. This is needed by qtwebengine.
|
||||
install -Dt "$1/usr/include/nss/obsolete" \
|
||||
-m644 dist/Linux*/include/obsolete/*.h
|
||||
|
||||
# Install the NSPR files. This is a joint package as I'd
|
||||
# rather not juggle which version of NSPR works best with NSS.
|
||||
install -Dt "$1/usr/include/nspr" -m644 nspr/pr/include/*.h
|
||||
install -Dt "$1/usr/include/nspr" -m644 nspr/lib/*/*.h
|
||||
|
||||
# Disgusting. Disgusting. Disgusting. Disgusting. Disgusting.
|
||||
find nspr/Linux* -name \*.so \
|
||||
-exec install -Dt "$1/usr/lib" {} \;
|
||||
nspr_ver="$(nspr-config --version)"
|
||||
|
||||
# This is disgusting and I hate this package with a passion.
|
||||
sed nss/pkg/pkg-config/nss.pc.in \
|
||||
|
|
@ -39,11 +28,7 @@ sed nss/pkg/pkg-config/nss.pc.in \
|
|||
-e "s,%prefix%,/usr,g" \
|
||||
-e "s,%exec_prefix%,/usr/bin,g" \
|
||||
-e "s,%includedir%,/usr/include/nss,g" \
|
||||
-e "s,%NSPR_VERSION%,4.29,g" \
|
||||
-e "s,%NSS_VERSION%,3.67,g" |
|
||||
-e "s,%NSPR_VERSION%,$nspr_ver,g" \
|
||||
-e "s,%NSS_VERSION%,$2,g" |
|
||||
install -Dm644 /dev/stdin "$1/usr/lib/pkgconfig/nss.pc"
|
||||
|
||||
# This is disgusting and I hate this package with a passion.
|
||||
sed nspr/Linux*/config/nspr.pc \
|
||||
-e "s,/usr/local,/usr,g" |
|
||||
install -Dm644 /dev/stdin "$1/usr/lib/pkgconfig/nspr.pc"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
683a4fc92aad224fde8ba18d49bdbc6ef93716731167d4e85d5654765162f042
|
||||
825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
linux-headers make
|
||||
perl make
|
||||
nspr
|
||||
sqlite
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_67_RTM/src/nss-3.67-with-nspr-4.29.tar.gz
|
||||
https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_77_RTM/src/nss-3.77.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.67 1
|
||||
3.77 1
|
||||
|
|
|
|||
|
|
@ -6,3 +6,5 @@
|
|||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
||||
install -Dm0770 xdm.service "$1/var/sysmgr/"
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4
|
||||
00cb4235b0ba850bb3a0d2aaa888f22eced7b1cea2ffdb1d946c59bd3ea75723
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
#!/bin/sh -e
|
||||
|
||||
exec xdm -nodaemon >> /var/log/xdm.log
|
||||
|
|
@ -1 +1,2 @@
|
|||
https://www.x.org/releases/individual/app/xdm-1.1.12.tar.bz2
|
||||
files/xdm.service
|
||||
|
|
|
|||
Loading…
Reference in New Issue