From c35d083dc525e223b085ec00e6863ea6eafb003c Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 17 Apr 2022 22:07:52 +0100 Subject: updated musl --- repo/system/at-spi2-atk.xibuild | 22 ++++++++++++++++++++++ repo/system/at-spi2-core.xibuild | 27 +++++++++++++++++++++++++++ repo/system/atk.xibuild | 22 ++++++++++++++++++++++ repo/system/binutils.xibuild | 24 +++++++----------------- repo/system/dbus.xibuild | 1 + repo/system/lcms2.xibuild | 27 +++++++++++++++++++++++++++ repo/system/libevent.xibuild | 28 ++++++++++++++++++++++++++++ repo/system/mpfr.xibuild | 2 +- repo/system/musl.xibuild | 13 +++++++------ repo/system/ncurses.xibuild | 3 ++- repo/system/perl.xibuild | 2 +- repo/system/re2.xibuild | 18 ++++++++++++++++++ repo/system/shared-mime-info.xibuild | 32 ++++++++++++++++++++++++++++++++ repo/system/snappy.xibuild | 30 ++++++++++++++++++++++++++++++ repo/system/startup-notification.xibuild | 23 +++++++++++++++++++++++ repo/system/ubase.xibuild | 2 +- 16 files changed, 249 insertions(+), 27 deletions(-) create mode 100644 repo/system/at-spi2-atk.xibuild create mode 100644 repo/system/at-spi2-core.xibuild create mode 100644 repo/system/atk.xibuild create mode 100644 repo/system/lcms2.xibuild create mode 100644 repo/system/libevent.xibuild create mode 100644 repo/system/re2.xibuild create mode 100644 repo/system/shared-mime-info.xibuild create mode 100644 repo/system/snappy.xibuild create mode 100644 repo/system/startup-notification.xibuild (limited to 'repo/system') diff --git a/repo/system/at-spi2-atk.xibuild b/repo/system/at-spi2-atk.xibuild new file mode 100644 index 0000000..9cdecd9 --- /dev/null +++ b/repo/system/at-spi2-atk.xibuild @@ -0,0 +1,22 @@ +#!/bin/sh + +NAME="at-spi2-atk" +DESC="A GTK+ module that bridges ATK to D-Bus at-spi" + +MAKEDEPS="meson ninja " +DEPS="at-spi2-core atk dbus glib " + +PKG_VER=2.38.0 +SOURCE="https://download.gnome.org/sources/at-spi2-atk/${PKG_VER%.*}/at-spi2-atk-$PKG_VER.tar.xz" + +build () { + mkdir build && + cd build && + meson --prefix=/usr \ + .. && + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install +} diff --git a/repo/system/at-spi2-core.xibuild b/repo/system/at-spi2-core.xibuild new file mode 100644 index 0000000..58e56a2 --- /dev/null +++ b/repo/system/at-spi2-core.xibuild @@ -0,0 +1,27 @@ +#!/bin/sh + +NAME="at-spi2-core" +DESC="Protocol definitions and daemon for D-Bus at-spi" + +MAKEDEPS="meson ninja " +DEPS="dbus glib intltool libx11 libxi libxtst musl " + +PKG_VER=2.44.0 +SOURCE="https://download.gnome.org/sources/at-spi2-core/${PKG_VER%.*}/at-spi2-core-$PKG_VER.tar.xz" + +build () { + mkdir build && + cd build && + meson --prefix=/usr \ + -Dx11=yes \ + -Dintrospection=yes \ + -Ddocs=true \ + -Ddbus_daemon=/usr/bin/dbus-daemon \ + .. && + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install + rm -rf $PKG_DEST/usr/lib/systemd +} diff --git a/repo/system/atk.xibuild b/repo/system/atk.xibuild new file mode 100644 index 0000000..4fd470a --- /dev/null +++ b/repo/system/atk.xibuild @@ -0,0 +1,22 @@ +#!/bin/sh + +NAME="atk" +DESC="A library providing a set of interfaces for accessibility" + +MAKEDEPS="meson ninja " +DEPS="glib intltool musl " + +PKG_VER=2.38.0 +SOURCE="https://download.gnome.org/sources/atk/${PKG_VER%.*}/atk-$PKG_VER.tar.xz" + +build () { + mkdir build && + cd build && + meson --prefix=/usr \ + .. && + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install +} diff --git a/repo/system/binutils.xibuild b/repo/system/binutils.xibuild index e65314f..3d67d07 100644 --- a/repo/system/binutils.xibuild +++ b/repo/system/binutils.xibuild @@ -6,20 +6,16 @@ DEPS="musl zlib libelf" PKG_VER=2.37 SOURCE=https://ftp.gnu.org/gnu/binutils/binutils-$PKG_VER.tar.xz -PATCH_SOURCE="https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/binutils-alpine" ADDITIONAL=" - $PATCH_SOURCE/0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch - $PATCH_SOURCE/bfd-close-file-desriptor-if-there-is-no-archive-fd.patch - $PATCH_SOURCE/binutils-ld-fix-static-linking.patch - $PATCH_SOURCE/defang-no-split.patch - " +0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch +bfd-close-file-desriptor-if-there-is-no-archive-fd.patch +binutils-ld-fix-static-linking.patch +" DESC="Tools for handling object files" prepare () { - for p in *.patch; do - patch -Np1 -i $p || true - done + apply_patches find . -name '[a-z]*\.[0-9]*' -empty -exec rm -f {} \; } @@ -27,18 +23,13 @@ prepare () { build () { mkdir build cd build - case $(uname -m) in - x86_64) export EXTRA_CONFIG=" --enable-targets=x86_64-pep " - ;; - i686) export EXTRA_CONFIG=" --disable-separate-code --enable-targets=x86_64-linux-gnu,x86_64-pep" - ;; - esac ../configure \ --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-multilib \ + --enable-shared \ --enable-ld=default \ --enable-gold \ --enable-64-bit-bfd \ @@ -51,8 +42,7 @@ build () { --with-pic \ --disable-werror \ --disable-nls \ - --with-mmap \ - --with-system-zlib + --with-mmap make tooldir=/usr } diff --git a/repo/system/dbus.xibuild b/repo/system/dbus.xibuild index ecda47d..3bbfc31 100644 --- a/repo/system/dbus.xibuild +++ b/repo/system/dbus.xibuild @@ -34,6 +34,7 @@ build () { package () { make DESTDIR=$PKG_DEST install + mv usr/lib/lib*.so.* $PKG_DEST/usr/lib/ chown root:messagebus $PKG_DEST/usr/libexec/dbus-daemon-launch-helper && chmod 4750 $PKG_DEST/usr/libexec/dbus-daemon-launch-helper diff --git a/repo/system/lcms2.xibuild b/repo/system/lcms2.xibuild new file mode 100644 index 0000000..3f9cdd3 --- /dev/null +++ b/repo/system/lcms2.xibuild @@ -0,0 +1,27 @@ +#!/bin/sh + +NAME="lcms2" +DESC="Color Management Engine" + +MAKEDEPS="make libjpeg-turbo tiff zlib" +DEPS="musl " + +PKG_VER=2.13.1 +SOURCE="https://github.com/mm2/Little-CMS/releases/download/lcms$PKG_VER/lcms2-$PKG_VER.tar.gz" + +build () { + ./configure \ + --prefix=/usr + --bindir=/usr/bin \ + --sysconfdir=/etc \ + --disable-static \ + --with-jpeg \ + --with-tiff \ + --with-zlib \ + --with-threads + make +} + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/libevent.xibuild b/repo/system/libevent.xibuild new file mode 100644 index 0000000..84e2dd4 --- /dev/null +++ b/repo/system/libevent.xibuild @@ -0,0 +1,28 @@ +#!/bin/sh + +NAME="libevent" +DESC="An event notification library" + +MAKEDEPS="make " +DEPS="openssl musl " + +PKG_VER=2.1.12 +SOURCE="https://github.com/libevent/libevent/releases/download/release-$PKG_VER-stable/libevent-$PKG_VER-stable.tar.gz" + +prepare() { + sed -i '1s|^#!/usr/bin/env python$|#!/usr/bin/python3|' event_rpcgen.py + sed -i -e "s/@VERSION@/$PKG_VER/" *.pc.in +} + +build () { + ./configure \ + --prefix=/usr + --bindir=/usr/bin \ + --sysconfdir=/etc \ + --disable-static + make +} + +package () { + make -j1 DESTDIR=$PKG_DEST install +} diff --git a/repo/system/mpfr.xibuild b/repo/system/mpfr.xibuild index 1e62aac..a0fc726 100644 --- a/repo/system/mpfr.xibuild +++ b/repo/system/mpfr.xibuild @@ -4,7 +4,7 @@ MAKEDEPS="make " DEPS="musl gmp" PKG_VER=4.1.0 -SOURCE=https://www.mpfr.org/mpfr-current/mpfr-$PKG_VER.tar.xz +SOURCE=https://ftp.gnu.org/gnu/mpfr/mpfr-$PKG_VER.tar.bz2 DESC="Multiple-precision floating-point library" diff --git a/repo/system/musl.xibuild b/repo/system/musl.xibuild index 13879f0..6f15382 100644 --- a/repo/system/musl.xibuild +++ b/repo/system/musl.xibuild @@ -3,15 +3,16 @@ MAKEDEPS="" DEPS="" -PKG_VER=1.2.2 +PKG_VER=1.2.3 SOURCE=https://musl.libc.org/releases/musl-$PKG_VER.tar.gz ADDITIONAL=" - https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/musl-mlfs/fix-utmp-wtmp-paths.patch - https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/musl-mlfs/change-scheduler-functions-Linux-compatib.patch - https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/musl-alpine/0001-riscv64-define-ELF_NFPREG.patch - https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/musl-alpine/handle-aux-at_base.patch - https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/musl-alpine/syscall-cp-epoll.patch +0001-riscv64-define-ELF_NFPREG.patch +change-scheduler-functions-Linux-compatib.patch +fix-utmp-wtmp-paths.patch +handle-aux-at_base.patch +qsort_r.patch +syscall-cp-epoll.patch " DESC="Implementation of the C standard library built on top of the Linux system call API" diff --git a/repo/system/ncurses.xibuild b/repo/system/ncurses.xibuild index f34211b..784ec63 100644 --- a/repo/system/ncurses.xibuild +++ b/repo/system/ncurses.xibuild @@ -14,8 +14,9 @@ build () { --with-shared \ --without-debug \ --without-normal \ + --enable-pc-files \ --enable-widec \ - + --with-pkg-config-libdir=/usr/lib/pkgconfig make } diff --git a/repo/system/perl.xibuild b/repo/system/perl.xibuild index 494b9f1..f12b9cf 100644 --- a/repo/system/perl.xibuild +++ b/repo/system/perl.xibuild @@ -3,7 +3,7 @@ MAKEDEPS="make sed" DEPS="gdbm musl bzip2 zlib tar" -PKG_VER=5.34.0 +PKG_VER=5.34.1 SOURCE=https://www.cpan.org/src/5.0/perl-$PKG_VER.tar.gz DESC="The Practical Extraction and Report Language" ADDITIONAL=" diff --git a/repo/system/re2.xibuild b/repo/system/re2.xibuild new file mode 100644 index 0000000..c4ef938 --- /dev/null +++ b/repo/system/re2.xibuild @@ -0,0 +1,18 @@ +#!/bin/sh + +NAME="re2" +DESC="Efficient, principled regular expression library" + +MAKEDEPS="make " +DEPS="musl " + +PKG_VER=2022.04.01 +SOURCE="https://github.com/google/re2/archive/$(echo $PKG_VER | sed "s/\./-/g").tar.gz" + +build () { + make PREFIX=/usr +} + +package () { + make PREFIX=/usr DESTDIR=$PKGDEST install +} diff --git a/repo/system/shared-mime-info.xibuild b/repo/system/shared-mime-info.xibuild new file mode 100644 index 0000000..e5d804d --- /dev/null +++ b/repo/system/shared-mime-info.xibuild @@ -0,0 +1,32 @@ +#!/bin/sh + +NAME="shared-mime-info" +DESC="Freedesktop.org Shared MIME Info" + +MAKEDEPS="meson ninja itstool libxml2-utils xmlto libxml2 glib" +DEPS="sbase glib libxml2 musl pkg-config " + +PKG_VER=2.2 +SOURCE="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/$PKG_VER/shared-mime-info-$PKG_VER.tar.gz" +ADDITIONAL=" +https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/shared-mime-info/trunk/MR_162.patch +" + +prepare () { + patch -Rp1 -i MR_162.patch +} + +build () { + mkdir build && + cd build && + meson --prefix=/usr \ + -Dupdate-mimedb=false \ + .. && + sed -i "s/xmlto /xmlto --skip-validation /g" build.ninja + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install +} + diff --git a/repo/system/snappy.xibuild b/repo/system/snappy.xibuild new file mode 100644 index 0000000..1d180bc --- /dev/null +++ b/repo/system/snappy.xibuild @@ -0,0 +1,30 @@ +#!/bin/sh + +NAME="snappy" +DESC="Fast compression and decompression library" + +MAKEDEPS="cmake" +DEPS="musl " + +PKG_VER=1.1.9 +SOURCE="https://github.com/google/snappy/archive/$PKG_VER.tar.gz" +ADDITIONAL="rtti.patch fix-inline.patch cmakelists.patch " + +prepare () { + apply_patches +} + +build () { + cmake -B build -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=OFF \ + -DSNAPPY_BUILD_BENCHMARKS=OFF + + cmake --build build +} + +package () { + DESTDIR="$PKG_DEST" cmake --install build +} diff --git a/repo/system/startup-notification.xibuild b/repo/system/startup-notification.xibuild new file mode 100644 index 0000000..08d7a85 --- /dev/null +++ b/repo/system/startup-notification.xibuild @@ -0,0 +1,23 @@ +#!/bin/sh + +NAME="startup-notification" +DESC="Monitor and display application startup" + +MAKEDEPS="make " +DEPS="libx11 libxcb musl xcb-util " + +PKG_VER=0.12 +SOURCE="https://www.freedesktop.org/software/startup-notification/releases/startup-notification-$PKG_VER.tar.gz" + +build () { + ./configure \ + --prefix=/usr + --bindir=/usr/bin \ + --sysconfdir=/etc \ + --disable-static + make +} + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/ubase.xibuild b/repo/system/ubase.xibuild index 30a7de3..0fd1258 100644 --- a/repo/system/ubase.xibuild +++ b/repo/system/ubase.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make " +MAKEDEPS="make findutils sed" DEPS="musl" SOURCE=https://git.suckless.org/ubase -- cgit v1.2.1