From 48ca75555522716f0f686dcae3dd6cf3d8ad714d Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 31 May 2022 11:05:19 +0100 Subject: removed idea of repos --- repo/devel/asciidoc/asciidoc.xibuild | 26 -- .../autoconf-archive/autoconf-archive.xibuild | 21 - repo/devel/autoconf/autoconf.xibuild | 17 - repo/devel/autoconf2-13/autoconf2-13.xibuild | 30 -- repo/devel/automake/automake.xibuild | 24 -- repo/devel/bc/bc.xibuild | 21 - repo/devel/bison/bison.xibuild | 17 - .../0001-revert-cease-dependence-on-range.patch | 1 - .../boost/boost-1.57.0-python-abi_letters.patch | 62 --- .../boost/boost-1.57.0-python-libpython_dep.patch | 13 - repo/devel/boost/boost.xibuild | 23 -- repo/devel/boost/python-3.10.patch | 49 --- repo/devel/cbindgen/cbindgen.xibuild | 18 - repo/devel/check/check.xibuild | 17 - repo/devel/cmake-extra/cmake-extra.xibuild | 20 - repo/devel/cmake-modules/cmake-modules.xibuild | 21 - repo/devel/cmake/cmake.xibuild | 17 - repo/devel/dejagnu/dejagnu.xibuild | 28 -- ...dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch | 65 --- repo/devel/distcc/distcc-hardened.patch | 24 -- repo/devel/distcc/distcc.xibuild | 34 -- repo/devel/distcc/gcc-10.patch | 15 - repo/devel/docbook-dtd/docbook-dtd.xibuild | 128 ------ repo/devel/docbook-xml/docbook-xml.xibuild | 132 ------- repo/devel/docbook-xsl/docbook-xsl.xibuild | 74 ---- repo/devel/docbook4-xml/docbook4-xml.xibuild | 104 ----- repo/devel/doxygen/doxygen.xibuild | 23 -- repo/devel/expect/expect.xibuild | 25 -- repo/devel/flex/flex.xibuild | 24 -- repo/devel/gcc/0001-posix_memalign.patch | 42 -- .../0003-Turn-on-Wl-z-relro-z-now-by-default.patch | 39 -- ...ORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch | 46 --- ...e-Wformat-and-Wformat-security-by-default.patch | 34 -- .../gcc/0007-Enable-Wtrampolines-by-default.patch | 25 -- ...-msgfmt-doesn-t-encounter-problems-during.patch | 54 --- ...-t-declare-asprintf-if-defined-as-a-macro.patch | 28 -- repo/devel/gcc/0012-libitm-disable-FORTIFY.patch | 33 -- repo/devel/gcc/0013-libgcc_s.patch | 57 --- ...__linux__-instead-of-__gnu_linux__-for-mu.patch | 25 -- .../devel/gcc/0016-dlang-update-zlib-binding.patch | 425 -------------------- ...ang-fix-fcntl-on-mips-add-libucontext-dep.patch | 51 --- repo/devel/gcc/0018-ada-fix-shared-linking.patch | 42 -- ...0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch | 24 -- .../devel/gcc/0020-add-fortify-headers-paths.patch | 25 -- ...-package-provides-libssp_nonshared.a.-We-.patch | 31 -- repo/devel/gcc/0023-Pure-64-bit-MIPS.patch | 47 --- ...re-64-bit-configuration-where-appropriate.patch | 121 ------ repo/devel/gcc/0025-always-build-libgcc_eh.a.patch | 51 --- repo/devel/gcc/0027-ada-musl-support-fixes.patch | 223 ----------- ...gcc-go-Use-_off_t-type-instead-of-_loff_t.patch | 48 --- .../gcc/0029-gcc-go-Don-t-include-sys-user.h.patch | 30 -- .../gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch | 29 -- ...-gcc-go-Fix-handling-of-signal-34-on-musl.patch | 43 -- ...se-int64-type-as-offset-argument-for-mmap.patch | 38 -- .../0035-gcc-go-Prefer-_off_t-over-_off64_t.patch | 30 -- ...o-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch | 27 -- .../gcc/0037-gcc-go-link-to-libucontext.patch | 25 -- ...ble-printing-of-unaccessible-ppc64-struct.patch | 26 -- ...-generic-errstr.go-implementation-on-musl.patch | 48 --- ...-on-nostdlib-nodefaultlibs-and-ffreestand.patch | 21 - ...dd-enable-autolink-libatomic-use-in-LINK_.patch | 21 - repo/devel/gcc/gcc.xibuild | 202 ---------- repo/devel/gcc/getconf.1 | 94 ----- repo/devel/gcc/getconf.c | 338 ---------------- repo/devel/gcc/getent.1 | 145 ------- repo/devel/gcc/getent.c | 437 --------------------- repo/devel/gcc/iconv.c | 110 ------ repo/devel/gcc/libgcc.xibuild | 8 - repo/devel/gcc/libstdc++.xibuild | 8 - repo/devel/gdb/gdb.xibuild | 32 -- repo/devel/git/git.xibuild | 19 - repo/devel/go/go.xibuild | 67 ---- repo/devel/gtk-doc/gtk-doc.xibuild | 22 -- repo/devel/help2man/help2man.xibuild | 18 - repo/devel/icecream/icecream.xibuild | 19 - repo/devel/imake/imake.xibuild | 23 -- repo/devel/itstool/itstool.xibuild | 19 - repo/devel/libexecinfo/10-execinfo.patch | 64 --- repo/devel/libexecinfo/20-define-gnu-source.patch | 24 -- repo/devel/libexecinfo/30-linux-makefile.patch | 44 --- repo/devel/libexecinfo/libexecinfo.xibuild | 32 -- .../clang-001-fix-unwind-chain-inclusion.patch | 44 --- repo/devel/llvm/clang-002-add-musl-triples.patch | 110 ------ repo/devel/llvm/clang-tools-extra.xibuild | 24 -- repo/devel/llvm/clang.xibuild | 18 - repo/devel/llvm/libclang.xibuild | 8 - repo/devel/llvm/libcxx-musl.patch | 26 -- repo/devel/llvm/libcxx-ssp-nonshared.patch | 11 - repo/devel/llvm/libcxx.xibuild | 12 - repo/devel/llvm/libcxxabi-dl.patch | 25 -- repo/devel/llvm/libcxxabi.xibuild | 10 - repo/devel/llvm/libunwind.xibuild | 14 - repo/devel/llvm/lld.xibuild | 15 - repo/devel/llvm/lldb-musl.patch | 31 -- repo/devel/llvm/llvm-001-musl.patch | 57 --- repo/devel/llvm/llvm-004-override-opt.patch | 18 - repo/devel/llvm/llvm.xibuild | 88 ----- repo/devel/m4/m4.xibuild | 22 -- repo/devel/make/make.xibuild | 17 - repo/devel/meson/meson.xibuild | 21 - repo/devel/mpc/mpc.xibuild | 24 -- repo/devel/nasm/nasm.xibuild | 17 - repo/devel/ninja/ninja.xibuild | 24 -- repo/devel/patch/patch.xibuild | 17 - repo/devel/pkg-config/pkg-config.xibuild | 24 -- ...-Prefer-libgcc_eh-over-libunwind-for-musl.patch | 24 -- .../0007-do-not-install-libunwind-source.patch | 19 - .../rust/alpine-move-py-scripts-to-share.patch | 23 -- repo/devel/rust/alpine-target.patch | 191 --------- repo/devel/rust/cargo.xibuild | 8 - repo/devel/rust/check-rustc | 109 ----- repo/devel/rust/install-template-shebang.patch | 10 - repo/devel/rust/link-musl-dynamically.patch | 17 - repo/devel/rust/musl-fix-linux_musl_base.patch | 23 -- repo/devel/rust/need-rpath.patch | 62 --- repo/devel/rust/need-ssp_nonshared.patch | 13 - repo/devel/rust/rust.xibuild | 75 ---- repo/devel/scdoc/scdoc.xibuild | 16 - repo/devel/sgml-common/sgml-common.xibuild | 30 -- repo/devel/strace/disable-fortify.patch | 39 -- repo/devel/strace/nlattr-fix.patch | 21 - repo/devel/strace/strace.xibuild | 33 -- repo/devel/swig/swig.xibuild | 20 - repo/devel/texinfo/texinfo.xibuild | 24 -- repo/devel/uthash/uthash.xibuild | 15 - repo/devel/vala/vala.xibuild | 23 -- repo/devel/waf/waf.xibuild | 14 - repo/devel/xmlto/xmlto.xibuild | 18 - repo/devel/xorg-cf-files/xorg-cf-files.xibuild | 23 -- 129 files changed, 6134 deletions(-) delete mode 100644 repo/devel/asciidoc/asciidoc.xibuild delete mode 100644 repo/devel/autoconf-archive/autoconf-archive.xibuild delete mode 100644 repo/devel/autoconf/autoconf.xibuild delete mode 100644 repo/devel/autoconf2-13/autoconf2-13.xibuild delete mode 100644 repo/devel/automake/automake.xibuild delete mode 100644 repo/devel/bc/bc.xibuild delete mode 100644 repo/devel/bison/bison.xibuild delete mode 100644 repo/devel/boost/0001-revert-cease-dependence-on-range.patch delete mode 100644 repo/devel/boost/boost-1.57.0-python-abi_letters.patch delete mode 100644 repo/devel/boost/boost-1.57.0-python-libpython_dep.patch delete mode 100644 repo/devel/boost/boost.xibuild delete mode 100644 repo/devel/boost/python-3.10.patch delete mode 100644 repo/devel/cbindgen/cbindgen.xibuild delete mode 100644 repo/devel/check/check.xibuild delete mode 100644 repo/devel/cmake-extra/cmake-extra.xibuild delete mode 100644 repo/devel/cmake-modules/cmake-modules.xibuild delete mode 100644 repo/devel/cmake/cmake.xibuild delete mode 100644 repo/devel/dejagnu/dejagnu.xibuild delete mode 100644 repo/devel/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch delete mode 100644 repo/devel/distcc/distcc-hardened.patch delete mode 100644 repo/devel/distcc/distcc.xibuild delete mode 100644 repo/devel/distcc/gcc-10.patch delete mode 100644 repo/devel/docbook-dtd/docbook-dtd.xibuild delete mode 100644 repo/devel/docbook-xml/docbook-xml.xibuild delete mode 100644 repo/devel/docbook-xsl/docbook-xsl.xibuild delete mode 100644 repo/devel/docbook4-xml/docbook4-xml.xibuild delete mode 100644 repo/devel/doxygen/doxygen.xibuild delete mode 100644 repo/devel/expect/expect.xibuild delete mode 100644 repo/devel/flex/flex.xibuild delete mode 100644 repo/devel/gcc/0001-posix_memalign.patch delete mode 100644 repo/devel/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch delete mode 100644 repo/devel/gcc/0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch delete mode 100644 repo/devel/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch delete mode 100644 repo/devel/gcc/0007-Enable-Wtrampolines-by-default.patch delete mode 100644 repo/devel/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch delete mode 100644 repo/devel/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch delete mode 100644 repo/devel/gcc/0012-libitm-disable-FORTIFY.patch delete mode 100644 repo/devel/gcc/0013-libgcc_s.patch delete mode 100644 repo/devel/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch delete mode 100644 repo/devel/gcc/0016-dlang-update-zlib-binding.patch delete mode 100644 repo/devel/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch delete mode 100644 repo/devel/gcc/0018-ada-fix-shared-linking.patch delete mode 100644 repo/devel/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch delete mode 100644 repo/devel/gcc/0020-add-fortify-headers-paths.patch delete mode 100644 repo/devel/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch delete mode 100644 repo/devel/gcc/0023-Pure-64-bit-MIPS.patch delete mode 100644 repo/devel/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch delete mode 100644 repo/devel/gcc/0025-always-build-libgcc_eh.a.patch delete mode 100644 repo/devel/gcc/0027-ada-musl-support-fixes.patch delete mode 100644 repo/devel/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch delete mode 100644 repo/devel/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch delete mode 100644 repo/devel/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch delete mode 100644 repo/devel/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch delete mode 100644 repo/devel/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch delete mode 100644 repo/devel/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch delete mode 100644 repo/devel/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch delete mode 100644 repo/devel/gcc/0037-gcc-go-link-to-libucontext.patch delete mode 100644 repo/devel/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch delete mode 100644 repo/devel/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch delete mode 100644 repo/devel/gcc/0042-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch delete mode 100644 repo/devel/gcc/0043-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch delete mode 100644 repo/devel/gcc/gcc.xibuild delete mode 100644 repo/devel/gcc/getconf.1 delete mode 100644 repo/devel/gcc/getconf.c delete mode 100644 repo/devel/gcc/getent.1 delete mode 100644 repo/devel/gcc/getent.c delete mode 100644 repo/devel/gcc/iconv.c delete mode 100644 repo/devel/gcc/libgcc.xibuild delete mode 100644 repo/devel/gcc/libstdc++.xibuild delete mode 100644 repo/devel/gdb/gdb.xibuild delete mode 100644 repo/devel/git/git.xibuild delete mode 100644 repo/devel/go/go.xibuild delete mode 100644 repo/devel/gtk-doc/gtk-doc.xibuild delete mode 100644 repo/devel/help2man/help2man.xibuild delete mode 100644 repo/devel/icecream/icecream.xibuild delete mode 100644 repo/devel/imake/imake.xibuild delete mode 100644 repo/devel/itstool/itstool.xibuild delete mode 100644 repo/devel/libexecinfo/10-execinfo.patch delete mode 100644 repo/devel/libexecinfo/20-define-gnu-source.patch delete mode 100644 repo/devel/libexecinfo/30-linux-makefile.patch delete mode 100644 repo/devel/libexecinfo/libexecinfo.xibuild delete mode 100644 repo/devel/llvm/clang-001-fix-unwind-chain-inclusion.patch delete mode 100644 repo/devel/llvm/clang-002-add-musl-triples.patch delete mode 100644 repo/devel/llvm/clang-tools-extra.xibuild delete mode 100644 repo/devel/llvm/clang.xibuild delete mode 100644 repo/devel/llvm/libclang.xibuild delete mode 100644 repo/devel/llvm/libcxx-musl.patch delete mode 100644 repo/devel/llvm/libcxx-ssp-nonshared.patch delete mode 100644 repo/devel/llvm/libcxx.xibuild delete mode 100644 repo/devel/llvm/libcxxabi-dl.patch delete mode 100644 repo/devel/llvm/libcxxabi.xibuild delete mode 100644 repo/devel/llvm/libunwind.xibuild delete mode 100644 repo/devel/llvm/lld.xibuild delete mode 100644 repo/devel/llvm/lldb-musl.patch delete mode 100644 repo/devel/llvm/llvm-001-musl.patch delete mode 100644 repo/devel/llvm/llvm-004-override-opt.patch delete mode 100644 repo/devel/llvm/llvm.xibuild delete mode 100644 repo/devel/m4/m4.xibuild delete mode 100644 repo/devel/make/make.xibuild delete mode 100644 repo/devel/meson/meson.xibuild delete mode 100644 repo/devel/mpc/mpc.xibuild delete mode 100644 repo/devel/nasm/nasm.xibuild delete mode 100644 repo/devel/ninja/ninja.xibuild delete mode 100644 repo/devel/patch/patch.xibuild delete mode 100644 repo/devel/pkg-config/pkg-config.xibuild delete mode 100644 repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch delete mode 100644 repo/devel/rust/0007-do-not-install-libunwind-source.patch delete mode 100644 repo/devel/rust/alpine-move-py-scripts-to-share.patch delete mode 100644 repo/devel/rust/alpine-target.patch delete mode 100644 repo/devel/rust/cargo.xibuild delete mode 100644 repo/devel/rust/check-rustc delete mode 100644 repo/devel/rust/install-template-shebang.patch delete mode 100644 repo/devel/rust/link-musl-dynamically.patch delete mode 100644 repo/devel/rust/musl-fix-linux_musl_base.patch delete mode 100644 repo/devel/rust/need-rpath.patch delete mode 100644 repo/devel/rust/need-ssp_nonshared.patch delete mode 100644 repo/devel/rust/rust.xibuild delete mode 100644 repo/devel/scdoc/scdoc.xibuild delete mode 100644 repo/devel/sgml-common/sgml-common.xibuild delete mode 100644 repo/devel/strace/disable-fortify.patch delete mode 100644 repo/devel/strace/nlattr-fix.patch delete mode 100644 repo/devel/strace/strace.xibuild delete mode 100644 repo/devel/swig/swig.xibuild delete mode 100644 repo/devel/texinfo/texinfo.xibuild delete mode 100644 repo/devel/uthash/uthash.xibuild delete mode 100644 repo/devel/vala/vala.xibuild delete mode 100644 repo/devel/waf/waf.xibuild delete mode 100644 repo/devel/xmlto/xmlto.xibuild delete mode 100644 repo/devel/xorg-cf-files/xorg-cf-files.xibuild (limited to 'repo/devel') diff --git a/repo/devel/asciidoc/asciidoc.xibuild b/repo/devel/asciidoc/asciidoc.xibuild deleted file mode 100644 index cd8a239..0000000 --- a/repo/devel/asciidoc/asciidoc.xibuild +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python " -DEPS="python libxslt docbook-xsl" - -PKG_VER=10.2.0 -SOURCE=https://github.com/asciidoc-py/asciidoc-py/releases/download/$PKG_VER/asciidoc-$PKG_VER.tar.gz -DESC="Text document format for short documents, articles, books and UNIX man pages" - -prepare () { - autoreconf -fi -} - -build () { - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info - make -} - -package () { - make DESTDIR="$PKG_DEST" install -} - diff --git a/repo/devel/autoconf-archive/autoconf-archive.xibuild b/repo/devel/autoconf-archive/autoconf-archive.xibuild deleted file mode 100644 index ff50482..0000000 --- a/repo/devel/autoconf-archive/autoconf-archive.xibuild +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="gawk grep m4 diffutils perl sh gettext" - -PKG_VER=2022.02.11 -SOURCE=https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-$PKG_VER.tar.xz -DESC="A collection of freely re-usable autoconf macros" - - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install - - # force these macros to use gnu grep rather than built in grep - sed -i "s/grep/ggrep/g" $PKG_DEST/usr/share/aclocal/*.m4 -} diff --git a/repo/devel/autoconf/autoconf.xibuild b/repo/devel/autoconf/autoconf.xibuild deleted file mode 100644 index 8068345..0000000 --- a/repo/devel/autoconf/autoconf.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="gawk m4 diffutils perl sh gettext" - -PKG_VER=2.71 -SOURCE=https://ftp.gnu.org/gnu/autoconf/autoconf-$PKG_VER.tar.xz -DESC="GNU programs for producing shell scripts that can automatically configure source code" - -build () { - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/autoconf2-13/autoconf2-13.xibuild b/repo/devel/autoconf2-13/autoconf2-13.xibuild deleted file mode 100644 index abddc17..0000000 --- a/repo/devel/autoconf2-13/autoconf2-13.xibuild +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make patch" -DEPS="perl" - -PKG_VER=2.13 -SOURCE=https://ftp.gnu.org/gnu/autoconf/autoconf-$PKG_VER.tar.gz -ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/autoconf-$PKG_VER-consolidated_fixes-1.patch - " - -DESC="GNU programs for producing shell scripts that can automatically configure source code, legacy $PKG_VER version" - -prepare() { - patch -Np1 -i autoconf-2.13-consolidated_fixes-1.patch && - mv autoconf.texi autoconf213.texi && - rm autoconf.info - -} - -build () { - ./configure --prefix=/usr --program-suffix=$PKG_VER && - make -} - -package () { - make DESTDIR=$PKG_DEST install - install -m644 autoconf213.info $PKG_DEST/usr/share/info && - install-info --info-dir=$PKG_DEST/usr/share/info autoconf213.info -} diff --git a/repo/devel/automake/automake.xibuild b/repo/devel/automake/automake.xibuild deleted file mode 100644 index 689d63c..0000000 --- a/repo/devel/automake/automake.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make autoconf" -DEPS="perl" - -PKG_VER=1.16.5 -SOURCE=https://ftp.gnu.org/gnu/automake/automake-$PKG_VER.tar.xz -DESC="A GNU tool for automatically creating Makefiles" - -build () { - ./configure --prefix=/usr -docdir=/usr/share/doc/automake-$PKG_VER - make -} - -#check () { - #make -j4 check || true -#} - -package () { - make DESTDIR=$PKG_DEST install - - # backwards compatibility? - ln -s /usr/bin/aclocal $PKG_DEST/usr/bin/aclocal-1.15 -} diff --git a/repo/devel/bc/bc.xibuild b/repo/devel/bc/bc.xibuild deleted file mode 100644 index ffe43a5..0000000 --- a/repo/devel/bc/bc.xibuild +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="readline" - -PKG_VER=5.2.1 -SOURCE=https://github.com/gavinhoward/bc/releases/download/$PKG_VER/bc-$PKG_VER.tar.xz -DESC="An arbitrary precision numeric processing language" - -build () { - CC=gcc ./configure --prefix=/usr -G -O3 - make -} - -check () { - make test -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/bison/bison.xibuild b/repo/devel/bison/bison.xibuild deleted file mode 100644 index 2f96141..0000000 --- a/repo/devel/bison/bison.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="musl m4 sh" - -PKG_VER=3.8.1 -SOURCE=https://ftp.gnu.org/gnu/bison/bison-$PKG_VER.tar.xz -DESC="The GNU general-purpose parser generator" - -build () { - ./configure --prefix=/usr --docdir=/usr/share/doc/bison-$PKG_VER - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/boost/0001-revert-cease-dependence-on-range.patch b/repo/devel/boost/0001-revert-cease-dependence-on-range.patch deleted file mode 100644 index 77b8178..0000000 --- a/repo/devel/boost/0001-revert-cease-dependence-on-range.patch +++ /dev/null @@ -1 +0,0 @@ -Too Many Requests \ No newline at end of file diff --git a/repo/devel/boost/boost-1.57.0-python-abi_letters.patch b/repo/devel/boost/boost-1.57.0-python-abi_letters.patch deleted file mode 100644 index 7df3ee7..0000000 --- a/repo/devel/boost/boost-1.57.0-python-abi_letters.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 -+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 -@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti - # using python : 2.3 : /usr/local/bin/python ; - # - rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? -- : condition * : extension-suffix ? ) -+ : condition * : extension-suffix ? : abi-letters ? ) - { - project.push-current $(.project) ; - -@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? - } - } - -- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; -+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; - - project.pop-current ; - } -@@ -653,7 +653,7 @@ local rule system-library-dependencies ( - - # Declare a target to represent Python's library. - # --local rule declare-libpython-target ( version ? : requirements * ) -+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) - { - # Compute the representation of Python version in the name of Python's - # library file. -@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve - } - - # Declare it. -- lib python.lib : : python$(lib-version) $(requirements) ; -+ lib python.lib : : python$(lib-version)$(abi-letters) $(requirements) ; - } - - - # Implementation of init. - local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : -- condition * : extension-suffix ? ) -+ condition * : extension-suffix ? : abi-letters ? ) - { - local prefix ; - local exec-prefix ; -@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o - extension-suffix ?= _d ; - } - extension-suffix ?= "" ; -+ abi-letters ?= "" ; - - # Normalize and dissect any version number. - local major-minor ; -@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o - } - else - { -- declare-libpython-target $(version) : $(target-requirements) ; -+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; - - # This is an evil hack. On, Windows, when Python is embedded, nothing - # seems to set up sys.path to include Python's standard library diff --git a/repo/devel/boost/boost-1.57.0-python-libpython_dep.patch b/repo/devel/boost/boost-1.57.0-python-libpython_dep.patch deleted file mode 100644 index 57bfc26..0000000 --- a/repo/devel/boost/boost-1.57.0-python-libpython_dep.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: boost_1_57_0/tools/build/src/tools/python.jam -=================================================================== ---- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) -+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) -@@ -994,7 +994,7 @@ - else - { - alias python_for_extensions -- : -+ : python - : $(target-requirements) - : - : $(usage-requirements) diff --git a/repo/devel/boost/boost.xibuild b/repo/devel/boost/boost.xibuild deleted file mode 100644 index 82d450f..0000000 --- a/repo/devel/boost/boost.xibuild +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -NAME="boost" -DESC="Free peer-reviewed portable C++ source libraries" - -MAKEDEPS="make python which zlib icu" -DEPS="musl gcc bzip2 zlib python icu" - -PKG_VER=1.79.0 -SOURCE="https://boostorg.jfrog.io/artifactory/main/release/$PKG_VER/source/boost_$(echo $PKG_VER | sed "s/\./_/g").tar.bz2" -ADDITIONAL="python-3.10.patch 0001-revert-cease-dependence-on-range.patch boost-1.57.0-python-libpython_dep.patch boost-1.57.0-python-abi_letters.patch " - -prepare () { - ./bootstrap.sh --prefix=/usr --with-python=python3 -} - -build () { - ./b2 --debug-building --no-cmake-config --toolset=gcc runtime-link=shared link=shared,static -} - -package () { - ./b2 install --prefix=$PKG_DEST/usr -} diff --git a/repo/devel/boost/python-3.10.patch b/repo/devel/boost/python-3.10.patch deleted file mode 100644 index 2e1d5e3..0000000 --- a/repo/devel/boost/python-3.10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e193f080c7d209516ac9b712fa0c50bb08026fa2 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 19 Oct 2021 12:24:31 +0000 -Subject: [PATCH] BoostConfig.cmake: allow searching for python310 - -* accept double digits in Python3_VERSION_MINOR - -* if someone is using e.g.: - find_package(Python3 REQUIRED) - find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) - - with python-3.10 then it currently fails with: - - -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") - -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter - CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): - Could not find a package configuration file provided by "boost_python310" - (requested version 1.77.0) with any of the following names: - - boost_python310Config.cmake - boost_python310-config.cmake - - Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or - set "boost_python310_DIR" to a directory containing one of the above files. - If "boost_python310" provides a separate development package or SDK, be - sure it has been installed. - Call Stack (most recent call first): - /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) - /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) - CMakeLists.txt:18 (find_package) - -Signed-off-by: Martin Jansa ---- - BoostConfig.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/BoostConfig.cmake b/BoostConfig.cmake -index fd17821..5dffa58 100644 ---- a/tools/boost_install/BoostConfig.cmake -+++ b/tools/boost_install/BoostConfig.cmake -@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) - set(_BOOST_REQUIRED REQUIRED) - endif() - -- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") -+ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") - - # handle pythonXY and numpyXY versioned components for compatibility - diff --git a/repo/devel/cbindgen/cbindgen.xibuild b/repo/devel/cbindgen/cbindgen.xibuild deleted file mode 100644 index 8bebc3a..0000000 --- a/repo/devel/cbindgen/cbindgen.xibuild +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -NAME="cbindgen" -DESC="Tool to generate C bindings from Rust code" - -MAKEDEPS="" -DEPS="gcc " - -PKG_VER=0.20.0 -SOURCE="https://crates.io/api/v1/crates/cbindgen/$PKG_VER/download" - -build () { - cargo build --release --locked --verbose -} - -package () { - install -Dm0755 target/release/cbindgen "$PKG_DEST/usr/bin/cbindgen" -} diff --git a/repo/devel/check/check.xibuild b/repo/devel/check/check.xibuild deleted file mode 100644 index 192e219..0000000 --- a/repo/devel/check/check.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="gawk" - -PKG_VER=0.15.2 -SOURCE=https://github.com/libcheck/check/releases/download/$PKG_VER/check-$PKG_VER.tar.gz -DESC="A unit testing framework for C" - -build () { - ./configure --prefix=/usr --disable-static - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/cmake-extra/cmake-extra.xibuild b/repo/devel/cmake-extra/cmake-extra.xibuild deleted file mode 100644 index a81994f..0000000 --- a/repo/devel/cmake-extra/cmake-extra.xibuild +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -MAKEDEPS="cmake" -DEPS="cmake" - -PKG_VER=1.6 -SOURCE=https://gitlab.com/ubports/core/cmake-extras/-/archive/$PKG_VER/cmake-extras-$PKG_VER.tar.gz -DESC="A collection of add-ons for the CMake build tool" - -build () { - cmake -B build \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr - cmake --build build - -} - -package () { - DESTDIR="$PKG_DEST" cmake --build build --target install -} diff --git a/repo/devel/cmake-modules/cmake-modules.xibuild b/repo/devel/cmake-modules/cmake-modules.xibuild deleted file mode 100644 index b23083d..0000000 --- a/repo/devel/cmake-modules/cmake-modules.xibuild +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -MAKEDEPS="cmake python-sphinx" -DEPS="cmake" - -PKG_VER=5.91.0 -SOURCE=https://download.kde.org/stable/frameworks/${PKG_VER%.*}/extra-cmake-modules-$PKG_VER.tar.xz -DESC="Extra CMake modules" - -build () { - cmake -B build \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSphinx_BUILD_EXECUTABLE=/usr/bin/sphinx-build - cmake --build build - -} - -package () { - DESTDIR="$PKG_DEST" cmake --build build --target install -} diff --git a/repo/devel/cmake/cmake.xibuild b/repo/devel/cmake/cmake.xibuild deleted file mode 100644 index 01be547..0000000 --- a/repo/devel/cmake/cmake.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="curl libarchive jsoncpp libuv rhash openssl" - -PKG_VER=3.22.1 -SOURCE=https://github.com/Kitware/CMake/releases/download/v$PKG_VER/cmake-$PKG_VER.tar.gz -DESC="A cross-platform open-source make system" - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/dejagnu/dejagnu.xibuild b/repo/devel/dejagnu/dejagnu.xibuild deleted file mode 100644 index 82e443d..0000000 --- a/repo/devel/dejagnu/dejagnu.xibuild +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="sh expect" - -PKG_VER=1.6.3 -SOURCE=https://ftp.gnu.org/gnu/dejagnu/dejagnu-$PKG_VER.tar.gz -DESC="a framework for running test suites on GNU tools" - -build () { - mkdir build - cd build - - ../configure --prefix=/usr - - makeinfo --html --no-split -o doc/dejagnu.html ../doc/dejagnu.texi - makeinfo --plaintext -o doc/dejagnu.txt ../doc/dejagnu.texi -} - -package () { - make DESTDIR=$PKG_DEST install - - install -dm755 $PKG_DEST/usr/share/doc/dejagnu-$PKG_VER - install -m644 doc/dejagnu.txt $PKG_DEST/usr/share/doc/dejagnu-$PKG_VER - install -m644 doc/dejagnu.html $PKG_DEST/usr/share/doc/dejagnu-$PKG_VER -} - - diff --git a/repo/devel/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch b/repo/devel/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch deleted file mode 100644 index 5d0a86d..0000000 --- a/repo/devel/distcc/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 879b71d6e95673e58d33f6c3c341a893ee307161 -Author: Alexey Sheplyakov -Date: Sat Jul 10 22:18:14 2021 +0400 - - dcc_gcc_rewrite_fqn: avoid heap corruption - - On ALT Linux I've run into the following bug: - - distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c - free(): invalid next size (fast) - Aborted (core dumped) - - Apparently dcc_gcc_rewrite writes beyond the allocated memory: - - valgrind --leak-check=full -v ./distcc gcc -Wall -std=gnu89 -I. -O2 -o hello.o -c hello.c - - ==11382== ERROR SUMMARY: 53 errors from 5 contexts (suppressed: 0 from 0) - ==11382== - ==11382== 1 errors in context 1 of 5: - ==11382== Invalid write of size 1 - ==11382== at 0x4C349D8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) - ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611) - ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725) - ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014) - ==11382== by 0x10E380: main (distcc.c:352) - ==11382== Address 0x544e828 is 1 bytes after a block of size 23 alloc'd - ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) - ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588) - ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725) - ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014) - ==11382== by 0x10E380: main (distcc.c:352) - ==11382== - ==11382== - ==11382== 1 errors in context 2 of 5: - ==11382== Invalid write of size 1 - ==11382== at 0x4C349C8: strcat (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) - ==11382== by 0x10D165: dcc_gcc_rewrite_fqn (compile.c:611) - ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725) - ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014) - ==11382== by 0x10E380: main (distcc.c:352) - ==11382== Address 0x544e827 is 0 bytes after a block of size 23 alloc'd - ==11382== at 0x4C31B0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) - ==11382== by 0x10D087: dcc_gcc_rewrite_fqn (compile.c:588) - ==11382== by 0x10D4B4: dcc_build_somewhere (compile.c:725) - ==11382== by 0x10DC01: dcc_build_somewhere_timed (compile.c:1014) - ==11382== by 0x10E380: main (distcc.c:352) - - and ALT Linux' hardened glibc does not quite like that. - Correctly compute the `newcmd_len` to avoid the problem. - - ALTBUG: #40425 - -diff --git a/src/compile.c b/src/compile.c -index 34964566fdd6..26d7d1821501 100644 ---- a/src/compile.c -+++ b/src/compile.c -@@ -584,7 +584,7 @@ static int dcc_gcc_rewrite_fqn(char **argv) - return -ENOENT; - - -- newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0] + 1); -+ newcmd_len = strlen(target_with_vendor) + 1 + strlen(argv[0]) + 1; - newcmd = malloc(newcmd_len); - if (!newcmd) - return -ENOMEM; diff --git a/repo/devel/distcc/distcc-hardened.patch b/repo/devel/distcc/distcc-hardened.patch deleted file mode 100644 index c50b15d..0000000 --- a/repo/devel/distcc/distcc-hardened.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Gordon Malm - -Make distcc client pass -D__KERNEL__ macro. Hardened GCC uses this -macro to determine if code intended to be run in-kernel is being compiled. -If the code is kernel code, certain compile flags are not applied. - -When using distcc to build kernel code (modules, etc.) without this patch, -the distccd host doesn't get passed -D__KERNEL__. Consequently, gcc on -the distccd host applies all kinds of flags that it shouldn't. - ---- distcc-2.18.3/src/strip.c -+++ distcc-2.18.3-hardened/src/strip.c -@@ -79,7 +79,10 @@ int dcc_strip_local_args(char **from, ch - /* skip through argv, copying all arguments but skipping ones that - * ought to be omitted */ - for (from_i = to_i = 0; from[from_i]; from_i++) { -- if (str_equal("-D", from[from_i]) -+ if (str_equal("-D__KERNEL__", from[from_i])) { -+ to[to_i++] = from[from_i]; -+ } -+ else if (str_equal("-D", from[from_i]) - || str_equal("-I", from[from_i]) - || str_equal("-U", from[from_i]) - || str_equal("-L", from[from_i]) diff --git a/repo/devel/distcc/distcc.xibuild b/repo/devel/distcc/distcc.xibuild deleted file mode 100644 index f333ed6..0000000 --- a/repo/devel/distcc/distcc.xibuild +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python make automake autoconf" -DEPS="gcc python popt musl-obstack" - -PKG_VER=3.4 -SOURCE=https://github.com/distcc/distcc/releases/download/v$PKG_VER/distcc-$PKG_VER.tar.gz -ADDITIONAL=" - gcc-10.patch - dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch - distcc-hardened.patch -" - -DESC="Distributed compiler for C, C++ and Objective-C" - -prepare () { - apply_patches -} - - -build () { - ./configure --prefix=/usr \ - --without-libiberty \ - --disable-Werror \ - --without-gtk \ - - - make -} - - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/distcc/gcc-10.patch b/repo/devel/distcc/gcc-10.patch deleted file mode 100644 index 599de51..0000000 --- a/repo/devel/distcc/gcc-10.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream: Should be -Reason: Fixes compilation under gcc-10 which has -fno-common - -diff --git a/src/stats.c b/src/stats.c -index 35dbf7d..76bfbee 100644 ---- a/src/stats.c -+++ b/src/stats.c -@@ -82,7 +82,7 @@ struct statsdata { - char compiler[MAX_FILENAME_LEN]; - }; - --const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD", -+extern const char *stats_text[20] = { "TCP_ACCEPT", "REJ_BAD_REQ", "REJ_OVERLOAD", - "COMPILE_OK", "COMPILE_ERROR", "COMPILE_TIMEOUT", "CLI_DISCONN", - "OTHER" }; diff --git a/repo/devel/docbook-dtd/docbook-dtd.xibuild b/repo/devel/docbook-dtd/docbook-dtd.xibuild deleted file mode 100644 index f751d36..0000000 --- a/repo/devel/docbook-dtd/docbook-dtd.xibuild +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -MAKEDEPS="unzip" -DEPS="libxml2 sgml-common" - -PKG_VER=4.5 -SOURCE=https://www.docbook.org/sgml/$PKG_VER/docbook-$PKG_VER.zip -DESC="Document type definitions for verification of SGML data files" - -prepare() { - sed -i -e '/ISO 8879/d' \ - -e '/gml/d' docbook.cat - -} - -package () { - install -d $PKG_DEST/usr/share/sgml/docbook/sgml-dtd-$PKG_VER && - chown -R root:root . && - - install docbook.cat $PKG_DEST/usr/share/sgml/docbook/sgml-dtd-$PKG_VER/catalog && - cp -af *.dtd *.mod *.dcl $PKG_DEST/usr/share/sgml/docbook/sgml-dtd-$PKG_VER && - - - cat >> $PKG_DEST/usr/share/sgml/docbook/sgml-dtd-$PKG_VER/catalog << "EOF" - -- Begin Single Major Version catalog changes -- - -PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "docbook.dtd" -PUBLIC "-//OASIS//DTD DocBook V4.3//EN" "docbook.dtd" -PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd" -PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" -PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd" - - -- End Single Major Version catalog changes -- -EOF -} - -postinstall () { - if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create /etc/xml/docbook - fi - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V4.5//EN" \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook && - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/4.5" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook - if [ ! -e /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//ENTITIES DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog - for DTDVERSION in 4.1.2 4.2 4.3 4.4; do - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \ - /etc/xml/docbook - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ - "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - /etc/xml/docbook - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog -done - -} - diff --git a/repo/devel/docbook-xml/docbook-xml.xibuild b/repo/devel/docbook-xml/docbook-xml.xibuild deleted file mode 100644 index 56efc6c..0000000 --- a/repo/devel/docbook-xml/docbook-xml.xibuild +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh - -MAKEDEPS="" -DEPS="libxml2" - -PKG_VER=5.1 -SOURCE=https://docbook.org/xml/$PKG_VER/docbook-v$PKG_VER-os.zip -DESC="A widely used XML scheme for writing documentation and help" - -package () { - install -dm755 $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER && - install -dm755 $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER && - install -m644 schemas/rng/* $PKG_DEST/usr/share/xml/docbook/schema/rng/$PKG_VER && - install -m644 schemas/sch/* $PKG_DEST/usr/share/xml/docbook/schema/sch/$PKG_VER && - install -m755 tools/db4-entities.pl $PKG_DEST/usr/bin && - install -dm755 $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5 && - install -m644 tools/db4-upgrade.xsl \ - $PKG_DEST/usr/share/xml/docbook/stylesheet/docbook5 -} - -postinstall () { - mkdir -p /etc/xml - if [ ! -e /etc/xml/docbook-$PKG_VER ]; then - xmlcatalog --noout --create /etc/xml/docbook-$PKG_VER - fi && - - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbook.rng" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/rng/docbook.rng" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rng" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/rng/docbookxi.rng" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rng" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rng" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbook.rnc" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/rng/docbook.rnc" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbook.rnc" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/rnc/docbookxi.rnc" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/rng/docbookxi.rnc" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/docbookxi.rnc" \ - /etc/xml/docbook-$PKG_VER && - - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/sch/docbook.sch" \ - "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \ - /etc/xml/docbook-$PKG_VER && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/sch/docbook.sch" \ - "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/docbook.sch" \ - /etc/xml/docbook-$PKG_VER - - xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \ - "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.schemas/rng" \ - "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \ - "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.schemas/rng" \ - "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/schemas/rng/docbook.rnc" \ - "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbook.rnc" \ - "docbook.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \ - "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/rng/docbookxi.rnc" \ - "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml - xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml && - - xmlcatalog --noout --add "uri" \ - "http://docbook.org/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \ - "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml && - xmlcatalog --noout --add "uri" \ - "http://www.oasis-open.org/docbook/xml/$PKG_VER/schemas/sch/docbook.schemas/sch" \ - "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml - - if [ ! -e /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi && - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//DTD DocBook XML $PKG_VER//EN" \ - "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateSystem" \ - "http://docbook.org/xml/$PKG_VER/dtd/" \ - "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://docbook.org/xml/$PKG_VER/dtd/" \ - "file:///usr/share/xml/docbook/schema/dtd/$PKG_VER/catalog.xml" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://docbook.org/xml/$PKG_VER/rng/" \ - "file:///usr/share/xml/docbook/schema/rng/$PKG_VER/catalog.xml" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://docbook.org/xml/$PKG_VER/sch/" \ - "file:///usr/share/xml/docbook/schema/sch/$PKG_VER/catalog.xml" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://docbook.org/xml/$PKG_VER/xsd/" \ - "file:///usr/share/xml/docbook/schema/xsd/$PKG_VER/catalog.xml" \ - /etc/xml/catalog -} - diff --git a/repo/devel/docbook-xsl/docbook-xsl.xibuild b/repo/devel/docbook-xsl/docbook-xsl.xibuild deleted file mode 100644 index f5d576d..0000000 --- a/repo/devel/docbook-xsl/docbook-xsl.xibuild +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -MAKEDEPS="patch" -DEPS="libxml2 libxslt docbook-xml" - -PKG_VER=1.79.2 -SOURCE=https://github.com/docbook/xslt10-stylesheets/releases/download/release/$PKG_VER/docbook-xsl-nons-$PKG_VER.tar.bz2 -ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/docbook-xsl-nons-$PKG_VER-stack_fix-1.patch -" - -DESC="XML stylesheets for Docbook-xml transformations" - -prepare() { - patch -Np1 -i docbook-xsl-nons-$PKG_VER-stack_fix-1.patch - -} - -package () { - install -m755 -d $PKG_DEST/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER && - - cp -R VERSION assembly common eclipse epub epub3 extensions fo \ - highlighting html htmlhelp images javahelp lib manpages params \ - profiling roundtrip slides template tests tools webhelp website \ - xhtml xhtml-1_1 xhtml5 \ - $PKG_DEST/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER && - - ln -s VERSION $PKG_DEST/usr/share/xml/docbook/xsl-stylesheets-nons-$PKG_VER/VERSION.xsl && - - install -m644 -D README \ - $PKG_DEST/usr/share/doc/docbook-xsl-nons-$PKG_VER/README.txt && - install -m644 RELEASE-NOTES* NEWS* \ - $PKG_DEST/usr/share/doc/docbook-xsl-nons-$PKG_VER - - - } - -postinstall () { - if [ ! -d /etc/xml ]; then install -m755 -d /etc/xml; fi && - if [ ! -f /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi && - - xmlcatalog --noout --add "rewriteSystem" \ - "https://cdn.docbook.org/release/xsl-nons/1.79.2" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ - /etc/xml/catalog && - - xmlcatalog --noout --add "rewriteURI" \ - "https://cdn.docbook.org/release/xsl-nons/1.79.2" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ - /etc/xml/catalog && - - xmlcatalog --noout --add "rewriteSystem" \ - "https://cdn.docbook.org/release/xsl-nons/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ - /etc/xml/catalog && - - xmlcatalog --noout --add "rewriteURI" \ - "https://cdn.docbook.org/release/xsl-nons/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ - /etc/xml/catalog && - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ - /etc/xml/catalog && - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \ - /etc/xml/catalog -} - diff --git a/repo/devel/docbook4-xml/docbook4-xml.xibuild b/repo/devel/docbook4-xml/docbook4-xml.xibuild deleted file mode 100644 index 36faa98..0000000 --- a/repo/devel/docbook4-xml/docbook4-xml.xibuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -MAKEDEPS="unzip" -DEPS="libxml2 sgml-common" - -PKG_VER=4.5 -SOURCE=https://www.docbook.org/xml/$PKG_VER/docbook-xml-$PKG_VER.zip -DESC="A widely used XML scheme for writing documentation and help" - -VERSIONS="4.5 4.4 4.3 4.2 4.1" - -ADDITIONAL=" - https://www.docbook.org/xml/4.4/docbook-xml-4.4.zip - https://www.docbook.org/xml/4.3/docbook-xml-4.3.zip - https://www.docbook.org/xml/4.2/docbook-xml-4.2.zip - https://www.docbook.org/xml/4.1/docbook-xml-4.1.zip -" - -package () { - for v in $VERSIONS; do - mkdir docbook-xml-$v - cd docbook-xml-$v - unzip -o ../docbook-xml-$v.zip - install -m755 -d $PKG_DEST/usr/share/xml/docbook/xml-dtd-$v && - install -m755 -d $PKG_DEST/etc/xml && - chown -R root:root . && - cp -af docbook.cat *.dtd ent/ *.mod \ - $PKG_DEST/usr/share/xml/docbook/xml-dtd-$v - - cd .. - done -} - -postinstall () { - for v in $VERSIONS; do - if [ ! -e /etc/xml/docbook ]; then - xmlcatalog --noout --create /etc/xml/docbook - fi - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML V$v//EN" \ - "http://www.oasis-open.org/docbook/xml/$v/docbookx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD DocBook XML CALS Table Model V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/calstblx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/soextblx.dtd" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Information Pool V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/dbpoolx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/dbhierx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ELEMENTS DocBook XML HTML Tables V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/htmltblx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Notations V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/dbnotnx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Character Entities V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/dbcentx.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "public" \ - "-//OASIS//ENTITIES DocBook XML Additional General Entities V$v//EN" \ - "file:///usr/share/xml/docbook/xml-dtd-$v/dbgenent.mod" \ - /etc/xml/docbook && - xmlcatalog --noout --add "rewriteSystem" \ - "http://www.oasis-open.org/docbook/xml/$v" \ - "file:///usr/share/xml/docbook/xml-dtd-$v" \ - /etc/xml/docbook && - xmlcatalog --noout --add "rewriteURI" \ - "http://www.oasis-open.org/docbook/xml/$v" \ - "file:///usr/share/xml/docbook/xml-dtd-$v" \ - /etc/xml/docbook - if [ ! -e /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//ENTITIES DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegatePublic" \ - "-//OASIS//DTD DocBook XML" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog && - xmlcatalog --noout --add "delegateURI" \ - "http://www.oasis-open.org/docbook/" \ - "file:///etc/xml/docbook" \ - /etc/xml/catalog - done -} - diff --git a/repo/devel/doxygen/doxygen.xibuild b/repo/devel/doxygen/doxygen.xibuild deleted file mode 100644 index 3c852c9..0000000 --- a/repo/devel/doxygen/doxygen.xibuild +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -NAME="doxygen" -DESC="A documentation system for C++, C, Java, IDL and PHP" - -MAKEDEPS="cmake " -DEPS="musl " - -PKG_VER=1.9.4 -SOURCE="https://doxygen.nl/files/doxygen-$PKG_VER.src.tar.gz" - -build () { - cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DBUILD_SHARED_LIBS=True \ - -DBUILD_STATIC_LIBS=OFF - cmake --build build -} - -package () { - DESTDIR="$PKG_DEST" cmake --install build -} diff --git a/repo/devel/expect/expect.xibuild b/repo/devel/expect/expect.xibuild deleted file mode 100644 index c2dd0d8..0000000 --- a/repo/devel/expect/expect.xibuild +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="tcl" - -PKG_VER=5.45.4 -SOURCE=https://sourceforge.net/projects/expect/files/Expect/$PKG_VER/expect$PKG_VER.tar.gz/download -DESC="tools for automating interactive applications" - -build () { - # note: --with-tcl, we might want to make a way to use the tcl that we've compiled in another package - ./configure --prefix=/usr --with-tcl=/usr/lib --enable-shared --mandir=/usr/share/man --with-tclinclude=/usr/include - make -} - -check () { - make test -} - -package () { - make DESTDIR=$PKG_DEST install - cp libexpect*.so $PKG_DEST/usr/lib -} - - diff --git a/repo/devel/flex/flex.xibuild b/repo/devel/flex/flex.xibuild deleted file mode 100644 index abf55f4..0000000 --- a/repo/devel/flex/flex.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make help2man" -DEPS="musl m4 sh" - -PKG_VER=2.6.4 -SOURCE=https://github.com/westes/flex/releases/download/v$PKG_VER/flex-$PKG_VER.tar.gz -DESC="a utility for generating programs that recognize patterns in text" - -build () { - ./configure --prefix=/usr --docdir=/usr/share/doc/flex --disable-static - make -} - -check () { - make check -} - -package () { - make DESTDIR=$PKG_DEST install - ln -s flex $PKG_DEST/usr/bin/lex -} - - diff --git a/repo/devel/gcc/0001-posix_memalign.patch b/repo/devel/gcc/0001-posix_memalign.patch deleted file mode 100644 index 50d489d..0000000 --- a/repo/devel/gcc/0001-posix_memalign.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0f6c64b962bb3bf75f15aec350a9d6f8997fa814 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy -Date: Fri, 26 Jan 2018 20:32:50 +0000 -Subject: [PATCH] posix_memalign - ---- - gcc/config/i386/pmm_malloc.h | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h -index 87344d9383f..ece428df487 100644 ---- a/gcc/config/i386/pmm_malloc.h -+++ b/gcc/config/i386/pmm_malloc.h -@@ -27,12 +27,13 @@ - #include - - /* We can't depend on since the prototype of posix_memalign -- may not be visible. */ -+ may not be visible and we can't pollute the namespace either. */ - #ifndef __cplusplus --extern int posix_memalign (void **, size_t, size_t); -+extern int _mm_posix_memalign (void **, size_t, size_t) - #else --extern "C" int posix_memalign (void **, size_t, size_t) throw (); -+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw () - #endif -+__asm__("posix_memalign"); - - static __inline void * - _mm_malloc (size_t __size, size_t __alignment) -@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment) - return malloc (__size); - if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4)) - __alignment = sizeof (void *); -- if (posix_memalign (&__ptr, __alignment, __size) == 0) -+ if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0) - return __ptr; - else - return NULL; --- -2.31.1 - diff --git a/repo/devel/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch b/repo/devel/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch deleted file mode 100644 index 334d17e..0000000 --- a/repo/devel/gcc/0003-Turn-on-Wl-z-relro-z-now-by-default.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ef512b8fcf9c7628267ff2dbb127aa094f6754f3 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:45:49 +0000 -Subject: [PATCH] Turn on -Wl,-z,relro,-z,now by default. - ---- - gcc/doc/invoke.texi | 3 +++ - gcc/gcc.c | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index cd31b522e42..17d371ef432 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -14663,6 +14663,9 @@ For example, @option{-Wl,-Map,output.map} passes @option{-Map output.map} to the - linker. When using the GNU linker, you can also get the same effect with - @option{-Wl,-Map=output.map}. - -+NOTE: In Alpine Linux, for LDFLAGS, the option -+@option{-Wl,-z,relro,now} is used. To disable, use @option{-Wl,-z,norelro}. -+ - @item -u @var{symbol} - @opindex u - Pretend the symbol @var{symbol} is undefined, to force linking of -diff --git a/gcc/gcc.c b/gcc/gcc.c -index b2200c5185a..625c9ab7902 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1039,6 +1039,7 @@ proper position among the other output files. */ - "%{flto|flto=*:% -Date: Fri, 21 Aug 2020 06:46:22 +0000 -Subject: [PATCH] Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, - ObjC++, if the optimization level is > 0 - ---- - gcc/c-family/c-cppbuiltin.c | 4 ++++ - gcc/doc/invoke.texi | 6 ++++++ - 2 files changed, 10 insertions(+) - -diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c -index db91a36794a..ed976c71404 100644 ---- a/gcc/c-family/c-cppbuiltin.c -+++ b/gcc/c-family/c-cppbuiltin.c -@@ -1385,6 +1385,10 @@ c_cpp_builtins (cpp_reader *pfile) - builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0); - builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0); - -+ /* Fortify Source enabled by default for optimization levels > 0 */ -+ if (optimize) -+ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2); -+ - /* Misc. */ - if (flag_gnu89_inline) - cpp_define (pfile, "__GNUC_GNU_INLINE__"); -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 17d371ef432..fe793ac08db 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -9230,6 +9230,12 @@ also turns on the following optimization flags: - Please note the warning under @option{-fgcse} about - invoking @option{-O2} on programs that use computed gotos. - -+NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is -+set by default, and is activated when @option{-O} is set to 2 or higher. -+This enables additional compile-time and run-time checks for several libc -+functions. To disable, specify either @option{-U_FORTIFY_SOURCE} or -+@option{-D_FORTIFY_SOURCE=0}. -+ - @item -O3 - @opindex O3 - Optimize yet more. @option{-O3} turns on all optimizations specified --- -2.31.1 - diff --git a/repo/devel/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch b/repo/devel/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch deleted file mode 100644 index aca0075..0000000 --- a/repo/devel/gcc/0006-Enable-Wformat-and-Wformat-security-by-default.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 44b1a01cbe3932122112f38e06a21b1c9efad568 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:47:43 +0000 -Subject: [PATCH] Enable -Wformat and -Wformat-security by default. - ---- - gcc/c-family/c.opt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt -index c49da99d395..93f25319005 100644 ---- a/gcc/c-family/c.opt -+++ b/gcc/c-family/c.opt -@@ -599,7 +599,7 @@ Warn about function calls with format strings that write past the end - of the destination region. Same as -Wformat-overflow=1. - - Wformat-security --C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0) -+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0) - Warn about possible security problems with format functions. - - Wformat-signedness -@@ -620,7 +620,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++ - Warn about zero-length formats. - - Wformat= --C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2) -+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) IntegerRange(0, 2) - Warn about printf/scanf/strftime/strfmon format string anomalies. - - Wformat-overflow= --- -2.31.1 - diff --git a/repo/devel/gcc/0007-Enable-Wtrampolines-by-default.patch b/repo/devel/gcc/0007-Enable-Wtrampolines-by-default.patch deleted file mode 100644 index 515d5e0..0000000 --- a/repo/devel/gcc/0007-Enable-Wtrampolines-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5679adc04a200e3a1a8dd77466eb79d03da8bf8a Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:48:24 +0000 -Subject: [PATCH] Enable -Wtrampolines by default. - ---- - gcc/common.opt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/common.opt b/gcc/common.opt -index ca942863064..0a0ab6195ee 100644 ---- a/gcc/common.opt -+++ b/gcc/common.opt -@@ -774,7 +774,7 @@ Common Var(warn_system_headers) Warning - Do not suppress warnings from system headers. - - Wtrampolines --Common Var(warn_trampolines) Warning -+Common Var(warn_trampolines) Init(1) Warning - Warn whenever a trampoline is generated. - - Wtype-limits --- -2.31.1 - diff --git a/repo/devel/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch b/repo/devel/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch deleted file mode 100644 index c4cd1fe..0000000 --- a/repo/devel/gcc/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 27863679bde671cdd354cba398ef71a956873e6a Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:50:33 +0000 -Subject: [PATCH] Ensure that msgfmt doesn't encounter problems during gcc - bootstrapping. - -Solves error messages like the following: - -msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6) - -The libgcc_s.so used during build doesn't satisfy the needs of the -libstdc++.so that msgfmt is linked against. On the other hand, msgfmt -is used as a stand-alone application here, and what library it uses -behind the scenes is of no concern to the gcc build process. -Therefore, simply invoking it "as usual", i.e. without any special -library path, will make it work as expected here. - -2011-09-19 Martin von Gagern - -References: -https://bugs.gentoo.org/372377 -https://bugs.gentoo.org/295480 ---- - libstdc++-v3/po/Makefile.am | 1 + - libstdc++-v3/po/Makefile.in | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am -index a9391d8d167..f7eee24dc8c 100644 ---- a/libstdc++-v3/po/Makefile.am -+++ b/libstdc++-v3/po/Makefile.am -@@ -38,6 +38,7 @@ MSGFMT = msgfmt - EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN) - - .po.mo: -+ env --unset=LD_LIBRARY_PATH \ - $(MSGFMT) -o $@ $< - - all-local: all-local-$(USE_NLS) -diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in -index a0f84b0cfa0..ab24a47a2fd 100644 ---- a/libstdc++-v3/po/Makefile.in -+++ b/libstdc++-v3/po/Makefile.in -@@ -548,6 +548,7 @@ uninstall-am: - - - .po.mo: -+ env --unset=LD_LIBRARY_PATH \ - $(MSGFMT) -o $@ $< - - all-local: all-local-$(USE_NLS) --- -2.31.1 - diff --git a/repo/devel/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch b/repo/devel/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch deleted file mode 100644 index 4fbd367..0000000 --- a/repo/devel/gcc/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 953779008f2caa78c55f80c2d6096bf627080016 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:52:07 +0000 -Subject: [PATCH] Don't declare asprintf if defined as a macro. - ---- - include/libiberty.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/libiberty.h b/include/libiberty.h -index 141cb886a85..fa0e78eb62f 100644 ---- a/include/libiberty.h -+++ b/include/libiberty.h -@@ -645,8 +645,11 @@ extern int pwait (int, int *, int); - /* Like sprintf but provides a pointer to malloc'd storage, which must - be freed by the caller. */ - -+/* asprintf may be declared as a macro by glibc with __USE_FORTIFY_LEVEL. */ -+#ifndef asprintf - extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2; - #endif -+#endif - - /* Like asprintf but allocates memory without fail. This works like - xmalloc. */ --- -2.31.1 - diff --git a/repo/devel/gcc/0012-libitm-disable-FORTIFY.patch b/repo/devel/gcc/0012-libitm-disable-FORTIFY.patch deleted file mode 100644 index 0f262f2..0000000 --- a/repo/devel/gcc/0012-libitm-disable-FORTIFY.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 10f38bef9af2e3d6a32253ca18d5ae0123e25e1b Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:53:36 +0000 -Subject: [PATCH] libitm: disable FORTIFY - ---- - libitm/configure.tgt | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libitm/configure.tgt b/libitm/configure.tgt -index d1beb5c9ec8..c2b50b95c01 100644 ---- a/libitm/configure.tgt -+++ b/libitm/configure.tgt -@@ -47,6 +47,16 @@ if test "$gcc_cv_have_tls" = yes ; then - esac - fi - -+# FIXME: error: inlining failed in call to always_inline -+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’ -+# : function body can be overwritten at link time -+# Disable Fortify in libitm for now. #508852 -+case "${target}" in -+ *-*-linux*) -+ XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE" -+ ;; -+esac -+ - # Map the target cpu to an ARCH sub-directory. At the same time, - # work out any special compilation flags as necessary. - case "${target_cpu}" in --- -2.31.1 - diff --git a/repo/devel/gcc/0013-libgcc_s.patch b/repo/devel/gcc/0013-libgcc_s.patch deleted file mode 100644 index 5569221..0000000 --- a/repo/devel/gcc/0013-libgcc_s.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3614b3586d4a0f75e454943895977a9df1b734d5 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy -Date: Sat, 24 Oct 2015 20:09:53 +0000 -Subject: [PATCH] libgcc_s - ---- - gcc/config/i386/i386-expand.c | 4 ++-- - libgcc/config/i386/cpuinfo.c | 6 +++--- - libgcc/config/i386/t-linux | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c -index 47d52550e5e..9cb8cc7950e 100644 ---- a/gcc/config/i386/i386-expand.c -+++ b/gcc/config/i386/i386-expand.c -@@ -10976,10 +10976,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget, - { - case IX86_BUILTIN_CPU_INIT: - { -- /* Make it call __cpu_indicator_init in libgcc. */ -+ /* Make it call __cpu_indicator_init_local in libgcc.a. */ - tree call_expr, fndecl, type; - type = build_function_type_list (integer_type_node, NULL_TREE); -- fndecl = build_fn_decl ("__cpu_indicator_init", type); -+ fndecl = build_fn_decl ("__cpu_indicator_init_local", type); - call_expr = build_call_expr (fndecl, 0); - return expand_expr (call_expr, target, mode, EXPAND_NORMAL); - } -diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c -index 83301a1445f..89fdc7eb587 100644 ---- a/libgcc/config/i386/cpuinfo.c -+++ b/libgcc/config/i386/cpuinfo.c -@@ -516,7 +516,7 @@ __cpu_indicator_init (void) - return 0; - } - --#if defined SHARED && defined USE_ELF_SYMVER --__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0"); --__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0"); -+#ifndef SHARED -+int __cpu_indicator_init_local (void) -+ __attribute__ ((weak, alias ("__cpu_indicator_init"))); - #endif -diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux -index 8506a635790..564296f788e 100644 ---- a/libgcc/config/i386/t-linux -+++ b/libgcc/config/i386/t-linux -@@ -3,5 +3,5 @@ - # t-slibgcc-elf-ver and t-linux - SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver - --HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS) -+HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS) - CRTSTUFF_T_CFLAGS += $(CET_FLAGS) --- -2.31.1 - diff --git a/repo/devel/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch b/repo/devel/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch deleted file mode 100644 index b36fa1e..0000000 --- a/repo/devel/gcc/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c5ee6bb497f640877be668428292487eb026d79e Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:57:09 +0000 -Subject: [PATCH] libffi: use __linux__ instead of __gnu_linux__ for musl - ---- - libffi/src/closures.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libffi/src/closures.c b/libffi/src/closures.c -index 721ff00ea43..22a699c6340 100644 ---- a/libffi/src/closures.c -+++ b/libffi/src/closures.c -@@ -34,7 +34,7 @@ - #include - - #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE --# if __gnu_linux__ && !defined(__ANDROID__) -+# if __linux__ && !defined(__ANDROID__) - /* This macro indicates it may be forbidden to map anonymous memory - with both write and execute permission. Code compiled when this - option is defined will attempt to map such pages once, but if it --- -2.31.1 - diff --git a/repo/devel/gcc/0016-dlang-update-zlib-binding.patch b/repo/devel/gcc/0016-dlang-update-zlib-binding.patch deleted file mode 100644 index 8a99d5c..0000000 --- a/repo/devel/gcc/0016-dlang-update-zlib-binding.patch +++ /dev/null @@ -1,425 +0,0 @@ -From b2e1bf216169f470ced86f1f3e95c89debf606cd Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:57:51 +0000 -Subject: [PATCH] dlang: update zlib binding - ---- - libphobos/src/std/zlib.d | 266 ++++++++++++++++++++++++++++----------- - 1 file changed, 196 insertions(+), 70 deletions(-) - -diff --git a/libphobos/src/std/zlib.d b/libphobos/src/std/zlib.d -index e6cce240fd5..bd2fe37ebec 100644 ---- a/libphobos/src/std/zlib.d -+++ b/libphobos/src/std/zlib.d -@@ -1,7 +1,7 @@ - // Written in the D programming language. - - /** -- * Compress/decompress data using the $(HTTP www._zlib.net, _zlib library). -+ * Compress/decompress data using the $(HTTP www.zlib.net, zlib library). - * - * Examples: - * -@@ -43,12 +43,12 @@ - * References: - * $(HTTP en.wikipedia.org/wiki/Zlib, Wikipedia) - * -- * Copyright: Copyright Digital Mars 2000 - 2011. -+ * Copyright: Copyright The D Language Foundation 2000 - 2011. - * License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0). - * Authors: $(HTTP digitalmars.com, Walter Bright) -- * Source: $(PHOBOSSRC std/_zlib.d) -+ * Source: $(PHOBOSSRC std/zlib.d) - */ --/* Copyright Digital Mars 2000 - 2011. -+/* Copyright The D Language Foundation 2000 - 2011. - * Distributed under the Boost Software License, Version 1.0. - * (See accompanying file LICENSE_1_0.txt or copy at - * http://www.boost.org/LICENSE_1_0.txt) -@@ -75,9 +75,9 @@ enum - - class ZlibException : Exception - { -- this(int errnum) -- { string msg; -- -+ private static string getmsg(int errnum) nothrow @nogc pure @safe -+ { -+ string msg; - switch (errnum) - { - case Z_STREAM_END: msg = "stream end"; break; -@@ -90,7 +90,12 @@ class ZlibException : Exception - case Z_VERSION_ERROR: msg = "version error"; break; - default: msg = "unknown error"; break; - } -- super(msg); -+ return msg; -+ } -+ -+ this(int errnum) -+ { -+ super(getmsg(errnum)); - } - } - -@@ -104,7 +109,7 @@ class ZlibException : Exception - * buf = buffer containing input data - * - * Returns: -- * A $(D uint) checksum for the provided input data and starting checksum -+ * A `uint` checksum for the provided input data and starting checksum - * - * See_Also: - * $(LINK http://en.wikipedia.org/wiki/Adler-32) -@@ -147,7 +152,7 @@ uint adler32(uint adler, const(void)[] buf) - * buf = buffer containing input data - * - * Returns: -- * A $(D uint) checksum for the provided input data and starting checksum -+ * A `uint` checksum for the provided input data and starting checksum - * - * See_Also: - * $(LINK http://en.wikipedia.org/wiki/Cyclic_redundancy_check) -@@ -191,13 +196,14 @@ uint crc32(uint crc, const(void)[] buf) - ubyte[] compress(const(void)[] srcbuf, int level) - in - { -- assert(-1 <= level && level <= 9); -+ assert(-1 <= level && level <= 9, "Compression level needs to be within [-1, 9]."); - } --body -+do - { - import core.memory : GC; -+ import std.array : uninitializedArray; - auto destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12; -- auto destbuf = new ubyte[destlen]; -+ auto destbuf = uninitializedArray!(ubyte[])(destlen); - auto err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *) srcbuf.ptr, srcbuf.length, level); - if (err) - { -@@ -276,7 +282,7 @@ void[] uncompress(const(void)[] srcbuf, size_t destlen = 0u, int winbits = 15) - throw new ZlibException(err); - } - } -- assert(0); -+ assert(0, "Unreachable code"); - } - - @system unittest -@@ -370,9 +376,9 @@ class Compress - this(int level, HeaderFormat header = HeaderFormat.deflate) - in - { -- assert(1 <= level && level <= 9); -+ assert(1 <= level && level <= 9, "Legal compression level are in [1, 9]."); - } -- body -+ do - { - this.level = level; - this.gzip = header == HeaderFormat.gzip; -@@ -406,6 +412,7 @@ class Compress - const(void)[] compress(const(void)[] buf) - { - import core.memory : GC; -+ import std.array : uninitializedArray; - int err; - ubyte[] destbuf; - -@@ -420,7 +427,7 @@ class Compress - inited = 1; - } - -- destbuf = new ubyte[zs.avail_in + buf.length]; -+ destbuf = uninitializedArray!(ubyte[])(zs.avail_in + buf.length); - zs.next_out = destbuf.ptr; - zs.avail_out = to!uint(destbuf.length); - -@@ -461,9 +468,10 @@ class Compress - void[] flush(int mode = Z_FINISH) - in - { -- assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH); -+ assert(mode == Z_FINISH || mode == Z_SYNC_FLUSH || mode == Z_FULL_FLUSH, -+ "Mode must be either Z_FINISH, Z_SYNC_FLUSH or Z_FULL_FLUSH."); - } -- body -+ do - { - import core.memory : GC; - ubyte[] destbuf; -@@ -523,6 +531,7 @@ class UnCompress - z_stream zs; - int inited; - int done; -+ bool inputEnded; - size_t destbufsize; - - HeaderFormat format; -@@ -571,16 +580,16 @@ class UnCompress - const(void)[] uncompress(const(void)[] buf) - in - { -- assert(!done); -+ assert(!done, "Buffer has been flushed."); - } -- body -+ do - { -+ if (inputEnded || !buf.length) -+ return null; -+ - import core.memory : GC; -+ import std.array : uninitializedArray; - int err; -- ubyte[] destbuf; -- -- if (buf.length == 0) -- return null; - - if (!inited) - { -@@ -598,26 +607,152 @@ class UnCompress - - if (!destbufsize) - destbufsize = to!uint(buf.length) * 2; -- destbuf = new ubyte[zs.avail_in * 2 + destbufsize]; -- zs.next_out = destbuf.ptr; -- zs.avail_out = to!uint(destbuf.length); -- -- if (zs.avail_in) -- buf = zs.next_in[0 .. zs.avail_in] ~ cast(ubyte[]) buf; -+ auto destbuf = uninitializedArray!(ubyte[])(destbufsize); -+ size_t destFill; - - zs.next_in = cast(ubyte*) buf.ptr; - zs.avail_in = to!uint(buf.length); - -- err = inflate(&zs, Z_NO_FLUSH); -- if (err != Z_STREAM_END && err != Z_OK) -+ while (true) - { -- GC.free(destbuf.ptr); -- error(err); -+ auto oldAvailIn = zs.avail_in; -+ -+ zs.next_out = destbuf[destFill .. $].ptr; -+ zs.avail_out = to!uint(destbuf.length - destFill); -+ -+ err = inflate(&zs, Z_NO_FLUSH); -+ if (err == Z_STREAM_END) -+ { -+ inputEnded = true; -+ break; -+ } -+ else if (err != Z_OK) -+ { -+ GC.free(destbuf.ptr); -+ error(err); -+ } -+ else if (!zs.avail_in) -+ break; -+ -+ /* -+ According to the zlib manual inflate() stops when either there's -+ no more data to uncompress or the output buffer is full -+ So at this point, the output buffer is too full -+ */ -+ -+ destFill = destbuf.length; -+ -+ if (destbuf.capacity) -+ { -+ if (destbuf.length < destbuf.capacity) -+ destbuf.length = destbuf.capacity; -+ else -+ { -+ auto newLength = GC.extend(destbuf.ptr, destbufsize, destbufsize); -+ -+ if (newLength && destbuf.length < destbuf.capacity) -+ destbuf.length = destbuf.capacity; -+ else -+ destbuf.length += destbufsize; -+ } -+ } -+ else -+ destbuf.length += destbufsize; - } -+ - destbuf.length = destbuf.length - zs.avail_out; - return destbuf; - } - -+ // Test for issues 3191 and 9505 -+ @system unittest -+ { -+ import std.algorithm.comparison; -+ import std.array; -+ import std.file; -+ import std.zlib; -+ -+ // Data that can be easily compressed -+ ubyte[1024] originalData; -+ -+ // This should yield a compression ratio of at least 1/2 -+ auto compressedData = compress(originalData, 9); -+ assert(compressedData.length < originalData.length / 2, -+ "The compression ratio is too low to accurately test this situation"); -+ -+ auto chunkSize = compressedData.length / 4; -+ assert(chunkSize < compressedData.length, -+ "The length of the compressed data is too small to accurately test this situation"); -+ -+ auto decompressor = new UnCompress(); -+ ubyte[originalData.length] uncompressedData; -+ ubyte[] reusedBuf; -+ int progress; -+ -+ reusedBuf.length = chunkSize; -+ -+ for (int i = 0; i < compressedData.length; i += chunkSize) -+ { -+ auto len = min(chunkSize, compressedData.length - i); -+ // simulate reading from a stream in small chunks -+ reusedBuf[0 .. len] = compressedData[i .. i + len]; -+ -+ // decompress using same input buffer -+ auto chunk = decompressor.uncompress(reusedBuf); -+ assert(progress + chunk.length <= originalData.length, -+ "The uncompressed result is bigger than the original data"); -+ -+ uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[]; -+ progress += chunk.length; -+ } -+ -+ auto chunk = decompressor.flush(); -+ assert(progress + chunk.length <= originalData.length, -+ "The uncompressed result is bigger than the original data"); -+ -+ uncompressedData[progress .. progress + chunk.length] = cast(const ubyte[]) chunk[]; -+ progress += chunk.length; -+ -+ assert(progress == originalData.length, -+ "The uncompressed and the original data sizes differ"); -+ assert(originalData[] == uncompressedData[], -+ "The uncompressed and the original data differ"); -+ } -+ -+ @system unittest -+ { -+ ubyte[1024] invalidData; -+ auto decompressor = new UnCompress(); -+ -+ try -+ { -+ auto uncompressedData = decompressor.uncompress(invalidData); -+ } -+ catch (ZlibException e) -+ { -+ assert(e.msg == "data error"); -+ return; -+ } -+ -+ assert(false, "Corrupted data didn't result in an error"); -+ } -+ -+ @system unittest -+ { -+ ubyte[2014] originalData = void; -+ auto compressedData = compress(originalData, 9); -+ -+ auto decompressor = new UnCompress(); -+ auto uncompressedData = decompressor.uncompress(compressedData ~ cast(ubyte[]) "whatever"); -+ -+ assert(originalData.length == uncompressedData.length, -+ "The uncompressed and the original data sizes differ"); -+ assert(originalData[] == uncompressedData[], -+ "The uncompressed and the original data differ"); -+ assert(!decompressor.uncompress("whatever").length, -+ "Compression continued after the end"); -+ } -+ - /** - * Decompress and return any remaining data. - * The returned data should be appended to that returned by uncompress(). -@@ -626,49 +761,40 @@ class UnCompress - void[] flush() - in - { -- assert(!done); -+ assert(!done, "Buffer has been flushed before."); - } - out - { -- assert(done); -+ assert(done, "Flushing failed."); - } -- body -+ do - { -- import core.memory : GC; -- ubyte[] extra; -- ubyte[] destbuf; -- int err; -- - done = 1; -- if (!inited) -- return null; -+ return null; -+ } - -- L1: -- destbuf = new ubyte[zs.avail_in * 2 + 100]; -- zs.next_out = destbuf.ptr; -- zs.avail_out = to!uint(destbuf.length); -+ /// Returns true if all input data has been decompressed and no further data -+ /// can be decompressed (inflate() returned Z_STREAM_END) -+ @property bool empty() const -+ { -+ return inputEnded; -+ } - -- err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH); -- if (err == Z_OK && zs.avail_out == 0) -- { -- extra ~= destbuf; -- goto L1; -- } -- if (err != Z_STREAM_END) -- { -- GC.free(destbuf.ptr); -- if (err == Z_OK) -- err = Z_BUF_ERROR; -- error(err); -- } -- destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr]; -- err = etc.c.zlib.inflateEnd(&zs); -- inited = 0; -- if (err) -- error(err); -- if (extra.length) -- destbuf = extra ~ destbuf; -- return destbuf; -+ /// -+ @system unittest -+ { -+ // some random data -+ ubyte[1024] originalData = void; -+ -+ // append garbage data (or don't, this works in both cases) -+ auto compressedData = cast(ubyte[]) compress(originalData) ~ cast(ubyte[]) "whatever"; -+ -+ auto decompressor = new UnCompress(); -+ auto uncompressedData = decompressor.uncompress(compressedData); -+ -+ assert(uncompressedData[] == originalData[], -+ "The uncompressed and the original data differ"); -+ assert(decompressor.empty, "The UnCompressor reports not being done"); - } - } - --- -2.31.1 - diff --git a/repo/devel/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch b/repo/devel/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch deleted file mode 100644 index b10008f..0000000 --- a/repo/devel/gcc/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 76c7eb27b9dfe96f2f1db4fa6f29ce28715ad2a4 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:58:22 +0000 -Subject: [PATCH] dlang: fix fcntl on mips, add libucontext dep - ---- - libphobos/configure.tgt | 1 + - libphobos/libdruntime/core/sys/posix/fcntl.d | 15 +++++++++++++++ - 2 files changed, 16 insertions(+) - -diff --git a/libphobos/configure.tgt b/libphobos/configure.tgt -index 94e42bf5509..73f2e4b7f01 100644 ---- a/libphobos/configure.tgt -+++ b/libphobos/configure.tgt -@@ -35,6 +35,7 @@ case "${target}" in - ;; - mips*-*-linux*) - LIBPHOBOS_SUPPORTED=yes -+ LIBDRUNTIME_NEEDS_UCONTEXT=yes - ;; - power*-*-linux*) - LIBPHOBOS_SUPPORTED=yes -diff --git a/libphobos/libdruntime/core/sys/posix/fcntl.d b/libphobos/libdruntime/core/sys/posix/fcntl.d -index 9febcff849b..cb34e2108bd 100644 ---- a/libphobos/libdruntime/core/sys/posix/fcntl.d -+++ b/libphobos/libdruntime/core/sys/posix/fcntl.d -@@ -870,6 +870,21 @@ else version (CRuntime_Musl) - F_SETLKW = 7, - } - } -+ else version (MIPS_Any) -+ { -+ enum -+ { -+ O_DIRECTORY = 0x010000, // octal 0200000 -+ O_NOFOLLOW = 0x020000, // octal 0400000 -+ O_DIRECT = 0x008000, // octal 0100000 -+ O_LARGEFILE = 0x002000, // octal 0020000 -+ O_TMPFILE = 0x410000, // octal 020200000 -+ -+ F_GETLK = 33, -+ F_SETLK = 34, -+ F_SETLKW = 35, -+ } -+ } - else - static assert(0, "Platform not supported"); - --- -2.31.1 - diff --git a/repo/devel/gcc/0018-ada-fix-shared-linking.patch b/repo/devel/gcc/0018-ada-fix-shared-linking.patch deleted file mode 100644 index 83cd1d5..0000000 --- a/repo/devel/gcc/0018-ada-fix-shared-linking.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 95fee2cfb1a6a32b7e671861b58ee93978ba16b8 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:59:16 +0000 -Subject: [PATCH] ada: fix shared linking - ---- - gcc/ada/link.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/gcc/ada/link.c b/gcc/ada/link.c -index 02c413a412f..f0e52a87d6e 100644 ---- a/gcc/ada/link.c -+++ b/gcc/ada/link.c -@@ -107,9 +107,9 @@ const char *__gnat_default_libgcc_subdir = "lib"; - || defined (__NetBSD__) || defined (__OpenBSD__) \ - || defined (__QNX__) - const char *__gnat_object_file_option = "-Wl,@"; --const char *__gnat_run_path_option = "-Wl,-rpath,"; --char __gnat_shared_libgnat_default = STATIC; --char __gnat_shared_libgcc_default = STATIC; -+const char *__gnat_run_path_option = ""; -+char __gnat_shared_libgnat_default = SHARED; -+char __gnat_shared_libgcc_default = SHARED; - int __gnat_link_max = 8192; - unsigned char __gnat_objlist_file_supported = 1; - const char *__gnat_object_library_extension = ".a"; -@@ -129,9 +129,9 @@ const char *__gnat_default_libgcc_subdir = "lib"; - - #elif defined (__linux__) || defined (__GLIBC__) - const char *__gnat_object_file_option = "-Wl,@"; --const char *__gnat_run_path_option = "-Wl,-rpath,"; --char __gnat_shared_libgnat_default = STATIC; --char __gnat_shared_libgcc_default = STATIC; -+const char *__gnat_run_path_option = ""; -+char __gnat_shared_libgnat_default = SHARED; -+char __gnat_shared_libgcc_default = SHARED; - int __gnat_link_max = 8192; - unsigned char __gnat_objlist_file_supported = 1; - const char *__gnat_object_library_extension = ".a"; --- -2.31.1 - diff --git a/repo/devel/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch b/repo/devel/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch deleted file mode 100644 index 34c2da1..0000000 --- a/repo/devel/gcc/0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aa0311c59892d7fbc4ffa9e2f0520391521cc4dd Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 06:59:43 +0000 -Subject: [PATCH] build: fix CXXFLAGS_FOR_BUILD passing - ---- - Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.in b/Makefile.in -index 36e369df6e7..63627db68cf 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -170,6 +170,7 @@ BUILD_EXPORTS = \ - # built for the build system to override those in BASE_FLAGS_TO_PASS. - EXTRA_BUILD_FLAGS = \ - CFLAGS="$(CFLAGS_FOR_BUILD)" \ -+ CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \ - LDFLAGS="$(LDFLAGS_FOR_BUILD)" - - # This is the list of directories to built for the host system. --- -2.31.1 - diff --git a/repo/devel/gcc/0020-add-fortify-headers-paths.patch b/repo/devel/gcc/0020-add-fortify-headers-paths.patch deleted file mode 100644 index f445401..0000000 --- a/repo/devel/gcc/0020-add-fortify-headers-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 39e86416709d3d34f46da7cd7b8a3e5a8f0ff7cd Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 07:01:06 +0000 -Subject: [PATCH] add fortify-headers paths - ---- - gcc/config/linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/linux.h b/gcc/config/linux.h -index 95654bcdb5a..d88df8f154a 100644 ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -167,6 +167,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - - #ifdef NATIVE_SYSTEM_HEADER_DIR - #define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR "/fortify", 0, 0, 0, 1, 0 }, \ - { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ - { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, - #else --- -2.31.1 - diff --git a/repo/devel/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch b/repo/devel/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch deleted file mode 100644 index 073d56f..0000000 --- a/repo/devel/gcc/0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c6b54651688cf062ae48ca3402d6d2e08b70ceed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= -Date: Fri, 21 Aug 2020 07:03:00 +0000 -Subject: [PATCH] Alpine musl package provides libssp_nonshared.a. We link to - it unconditionally, as otherwise we get link failures if some objects are - -fstack-protector built and final link happens with -fno-stack-protector. - This seems to be the common case when bootstrapping gcc, the piepatches do - not seem to fully fix the crosstoolchain and bootstrap sequence wrt. - stack-protector flag usage. - ---- - gcc/gcc.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index daeb4d0c8ea..6920bec0fa0 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -894,8 +894,7 @@ proper position among the other output files. */ - - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP --#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ -- "|fstack-protector-strong|fstack-protector-explicit:}" -+#define LINK_SSP_SPEC "-lssp_nonshared" - #else - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ - "|fstack-protector-strong|fstack-protector-explicit" \ --- -2.31.1 - diff --git a/repo/devel/gcc/0023-Pure-64-bit-MIPS.patch b/repo/devel/gcc/0023-Pure-64-bit-MIPS.patch deleted file mode 100644 index c8f9c98..0000000 --- a/repo/devel/gcc/0023-Pure-64-bit-MIPS.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 720c0d7094d27b6cbfe9669c4f65e2021debcb07 Mon Sep 17 00:00:00 2001 -From: Nils Andreas Svee -Date: Thu, 21 Dec 2017 03:14:33 +0100 -Subject: [PATCH] Pure 64-bit MIPS - ---- - gcc/config/mips/mips.h | 8 ++++---- - gcc/config/mips/t-linux64 | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h -index 3ce0c19a29a..b9920b49167 100644 ---- a/gcc/config/mips/mips.h -+++ b/gcc/config/mips/mips.h -@@ -3424,11 +3424,11 @@ struct GTY(()) machine_function { - /* If we are *not* using multilibs and the default ABI is not ABI_32 we - need to change these from /lib and /usr/lib. */ - #if MIPS_ABI_DEFAULT == ABI_N32 --#define STANDARD_STARTFILE_PREFIX_1 "/lib32/" --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib32/" -+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" - #elif MIPS_ABI_DEFAULT == ABI_64 --#define STANDARD_STARTFILE_PREFIX_1 "/lib64/" --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib64/" -+#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" - #endif - - /* Load store bonding is not supported by micromips and fix_24k. The -diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 -index ceb58d3b5f3..8116e23ebba 100644 ---- a/gcc/config/mips/t-linux64 -+++ b/gcc/config/mips/t-linux64 -@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64 - MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) - MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) - MULTILIB_OSDIRNAMES = \ -- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ -- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ -- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) -+ ../lib \ -+ ../lib32 \ -+ ../lib --- -2.31.1 - diff --git a/repo/devel/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch b/repo/devel/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch deleted file mode 100644 index eb592dc..0000000 --- a/repo/devel/gcc/0024-use-pure-64-bit-configuration-where-appropriate.patch +++ /dev/null @@ -1,121 +0,0 @@ -From c60bb23972769f687dcac689ddf00f88e46b8bb7 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 07:04:40 +0000 -Subject: [PATCH] use pure 64-bit configuration where appropriate - ---- - gcc/config/aarch64/t-aarch64-linux | 2 +- - gcc/config/i386/t-linux64 | 4 ++-- - gcc/config/rs6000/t-linux | 6 ++++-- - gcc/config/rs6000/t-linux64 | 4 ++-- - gcc/config/rs6000/t-linux64bele | 4 ++-- - gcc/config/rs6000/t-linux64lebe | 4 ++-- - gcc/config/s390/t-linux64 | 4 ++-- - 7 files changed, 15 insertions(+), 13 deletions(-) - -diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux -index 83e59e33b85..6ec56fdf6a8 100644 ---- a/gcc/config/aarch64/t-aarch64-linux -+++ b/gcc/config/aarch64/t-aarch64-linux -@@ -22,7 +22,7 @@ LIB1ASMSRC = aarch64/lib1funcs.asm - LIB1ASMFUNCS = _aarch64_sync_cache_range - - AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) --MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu) -+MULTILIB_OSDIRNAMES = mabi.lp64=../lib - MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) - - MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) -diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 -index 1171e218578..256f8c079ba 100644 ---- a/gcc/config/i386/t-linux64 -+++ b/gcc/config/i386/t-linux64 -@@ -33,6 +33,6 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) -diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux -index aeb7440c492..ab14c455d8d 100644 ---- a/gcc/config/rs6000/t-linux -+++ b/gcc/config/rs6000/t-linux -@@ -2,7 +2,8 @@ - # or soft-float. - ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) - ifneq (,$(findstring powerpc64,$(target))) --MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu) -+MULTILIB_OSDIRNAMES := m64=../lib -+MULTILIB_OSDIRNAMES += m32=../lib32 - else - MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu) - endif -@@ -10,7 +11,8 @@ ifneq (,$(findstring powerpcle,$(target))) - MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME)) - endif - ifneq (,$(findstring powerpc64le,$(target))) --MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)) -+MULTILIB_OSDIRNAMES := m64=../lib -+MULTILIB_OSDIRNAMES += m32=../lib32 - endif - endif - -diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 -index 264a7e27524..d1e460811cc 100644 ---- a/gcc/config/rs6000/t-linux64 -+++ b/gcc/config/rs6000/t-linux64 -@@ -28,8 +28,8 @@ - MULTILIB_OPTIONS := m64/m32 - MULTILIB_DIRNAMES := 64 32 - MULTILIB_EXTRA_OPTS := --MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) --MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) -+MULTILIB_OSDIRNAMES := m64=../lib -+MULTILIB_OSDIRNAMES += m32=../lib32 - - rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c - $(COMPILE) $< -diff --git a/gcc/config/rs6000/t-linux64bele b/gcc/config/rs6000/t-linux64bele -index 97c1ee6fb4d..08d72639cb6 100644 ---- a/gcc/config/rs6000/t-linux64bele -+++ b/gcc/config/rs6000/t-linux64bele -@@ -2,6 +2,6 @@ - - MULTILIB_OPTIONS += mlittle - MULTILIB_DIRNAMES += le --MULTILIB_OSDIRNAMES += $(subst =,.mlittle=,$(subst lible32,lib32le,$(subst lible64,lib64le,$(subst lib,lible,$(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES)))))) --MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mlittle%,$(MULTILIB_OSDIRNAMES))) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} -diff --git a/gcc/config/rs6000/t-linux64lebe b/gcc/config/rs6000/t-linux64lebe -index 2e63bdb9fc9..c6e1c5db65d 100644 ---- a/gcc/config/rs6000/t-linux64lebe -+++ b/gcc/config/rs6000/t-linux64lebe -@@ -2,6 +2,6 @@ - - MULTILIB_OPTIONS += mbig - MULTILIB_DIRNAMES += be --MULTILIB_OSDIRNAMES += $(subst =,.mbig=,$(subst libbe32,lib32be,$(subst libbe64,lib64be,$(subst lib,libbe,$(subst le-linux,-linux,$(MULTILIB_OSDIRNAMES)))))) --MULTILIB_OSDIRNAMES += $(subst $(if $(findstring 64,$(target)),m64,m32).,,$(filter $(if $(findstring 64,$(target)),m64,m32).mbig%,$(MULTILIB_OSDIRNAMES))) -+MULTILIB_OSDIRNAMES := m64=../lib -+MULTILIB_OSDIRNAMES += m32=../lib32 - MULTILIB_MATCHES := ${MULTILIB_MATCHES_ENDIAN} -diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64 -index cc6ab367072..7f498ee1cdc 100644 ---- a/gcc/config/s390/t-linux64 -+++ b/gcc/config/s390/t-linux64 -@@ -7,5 +7,5 @@ - - MULTILIB_OPTIONS = m64/m31 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu) --MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 --- -2.31.1 - diff --git a/repo/devel/gcc/0025-always-build-libgcc_eh.a.patch b/repo/devel/gcc/0025-always-build-libgcc_eh.a.patch deleted file mode 100644 index 65324ab..0000000 --- a/repo/devel/gcc/0025-always-build-libgcc_eh.a.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 00917df4274ea2fb33b08c963a97cf1b28f59dd3 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 07:05:41 +0000 -Subject: [PATCH] always build libgcc_eh.a - -highly inspired by: - http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch ---- - libgcc/Makefile.in | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in -index 851e7657d07..99ec513a1a6 100644 ---- a/libgcc/Makefile.in -+++ b/libgcc/Makefile.in -@@ -956,8 +956,9 @@ ifneq ($(LIBUNWIND),) - all: libunwind.a - endif - -+all: libgcc_eh.a - ifeq ($(enable_shared),yes) --all: libgcc_eh.a libgcc_s$(SHLIB_EXT) -+all: libgcc_s$(SHLIB_EXT) - ifneq ($(LIBUNWIND),) - all: libunwind$(SHLIB_EXT) - libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT) -@@ -1159,10 +1160,6 @@ install-libunwind: - install-shared: - $(mkinstalldirs) $(DESTDIR)$(inst_libdir) - -- $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/ -- chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a -- $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a -- - $(subst @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL)))) -@@ -1179,6 +1176,10 @@ ifeq ($(enable_gcov),yes) - $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcov.a - endif - -+ $(INSTALL_DATA) libgcc_eh.a $(DESTDIR)$(inst_libdir)/ -+ chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a -+ $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a -+ - parts="$(INSTALL_PARTS)"; \ - for file in $$parts; do \ - rm -f $(DESTDIR)$(inst_libdir)/$$file; \ --- -2.31.1 - diff --git a/repo/devel/gcc/0027-ada-musl-support-fixes.patch b/repo/devel/gcc/0027-ada-musl-support-fixes.patch deleted file mode 100644 index 0f4ef64..0000000 --- a/repo/devel/gcc/0027-ada-musl-support-fixes.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 21692d89e7876dcaecea3e3c961c6504be4a83e9 Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Fri, 21 Aug 2020 07:07:48 +0000 -Subject: [PATCH] ada: musl support fixes - ---- - gcc/ada/Makefile.rtl | 10 +++++----- - gcc/ada/adaint.c | 34 +++++++++++++++++++--------------- - gcc/ada/adaint.h | 10 ++++------ - gcc/ada/terminals.c | 8 ++++---- - 4 files changed, 32 insertions(+), 30 deletions(-) - -diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl -index 55ff9b0f3d5..0fadf4e4b79 100644 ---- a/gcc/ada/Makefile.rtl -+++ b/gcc/ada/Makefile.rtl -@@ -1533,7 +1533,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),) - s-intman.adb - #include - #endif -+ -+#if defined (linux) -+#define _GNU_SOURCE 1 -+#include -+#endif - - #ifdef __PikeOS__ - #define __BSD_VISIBLE 1 -@@ -3308,7 +3313,6 @@ __gnat_lwp_self (void) - #endif - - #if defined (__linux__) --#include - - /* glibc versions earlier than 2.7 do not define the routines to handle - dynamically allocated CPU sets. For these targets, we use the static -@@ -3318,7 +3322,7 @@ __gnat_lwp_self (void) - - /* Dynamic cpu sets */ - --cpu_set_t * -+void * - __gnat_cpu_alloc (size_t count) - { - return CPU_ALLOC (count); -@@ -3331,33 +3335,33 @@ __gnat_cpu_alloc_size (size_t count) - } - - void --__gnat_cpu_free (cpu_set_t *set) -+__gnat_cpu_free (void *set) - { -- CPU_FREE (set); -+ CPU_FREE ((cpu_set_t *) set); - } - - void --__gnat_cpu_zero (size_t count, cpu_set_t *set) -+__gnat_cpu_zero (size_t count, void *set) - { -- CPU_ZERO_S (count, set); -+ CPU_ZERO_S (count, (cpu_set_t *) set); - } - - void --__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set) -+__gnat_cpu_set (int cpu, size_t count, void *set) - { - /* Ada handles CPU numbers starting from 1, while C identifies the first - CPU by a 0, so we need to adjust. */ -- CPU_SET_S (cpu - 1, count, set); -+ CPU_SET_S (cpu - 1, count, (cpu_set_t *) set); - } - - #else /* !CPU_ALLOC */ - - /* Static cpu sets */ - --cpu_set_t * -+void * - __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED) - { -- return (cpu_set_t *) xmalloc (sizeof (cpu_set_t)); -+ return xmalloc (sizeof (cpu_set_t)); - } - - size_t -@@ -3367,23 +3371,23 @@ __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED) - } - - void --__gnat_cpu_free (cpu_set_t *set) -+__gnat_cpu_free (void *set) - { - free (set); - } - - void --__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) -+__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set) - { -- CPU_ZERO (set); -+ CPU_ZERO ((cpu_set_t *) set); - } - - void --__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) -+__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set) - { - /* Ada handles CPU numbers starting from 1, while C identifies the first - CPU by a 0, so we need to adjust. */ -- CPU_SET (cpu - 1, set); -+ CPU_SET (cpu - 1, (cpu_set_t *) set); - } - #endif /* !CPU_ALLOC */ - #endif /* __linux__ */ -diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h -index 311e240dfcc..1c4d0050103 100644 ---- a/gcc/ada/adaint.h -+++ b/gcc/ada/adaint.h -@@ -316,13 +316,11 @@ extern void *__gnat_lwp_self (void); - - /* Routines for interface to required CPU set primitives */ - --#include -- --extern cpu_set_t *__gnat_cpu_alloc (size_t); -+extern void * __gnat_cpu_alloc (size_t); - extern size_t __gnat_cpu_alloc_size (size_t); --extern void __gnat_cpu_free (cpu_set_t *); --extern void __gnat_cpu_zero (size_t, cpu_set_t *); --extern void __gnat_cpu_set (int, size_t, cpu_set_t *); -+extern void __gnat_cpu_free (void *); -+extern void __gnat_cpu_zero (size_t, void *); -+extern void __gnat_cpu_set (int, size_t, void *); - #endif - - #if defined (_WIN32) -diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c -index af4417fab90..bab6bf3ca87 100644 ---- a/gcc/ada/terminals.c -+++ b/gcc/ada/terminals.c -@@ -1145,7 +1145,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns) - /* POSIX does not specify how to open the master side of a terminal.Several - methods are available (system specific): - 1- using a cloning device (USE_CLONE_DEVICE) -- 2- getpt (USE_GETPT) -+ 2- posix_openpt (USE_POSIX_OPENPT) - 3- openpty (USE_OPENPTY) - - When using the cloning device method, the macro USE_CLONE_DEVICE should -@@ -1159,7 +1159,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns) - #if defined (__APPLE__) || defined (BSD) - #define USE_OPENPTY - #elif defined (__linux__) --#define USE_GETPT -+#define USE_POSIX_OPENPT - #elif defined (__sun__) - #define USE_CLONE_DEVICE "/dev/ptmx" - #elif defined (_AIX) -@@ -1208,8 +1208,8 @@ allocate_pty_desc (pty_desc **desc) { - int master_fd = -1; - char *slave_name = NULL; - --#ifdef USE_GETPT -- master_fd = getpt (); -+#if defined(USE_POSIX_OPENPT) -+ master_fd = posix_openpt(O_RDWR | O_NOCTTY); - #elif defined (USE_OPENPTY) - status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL); - #elif defined (USE_CLONE_DEVICE) --- -2.31.1 - diff --git a/repo/devel/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch b/repo/devel/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch deleted file mode 100644 index 2932ce7..0000000 --- a/repo/devel/gcc/0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1852ae06e733180f090b58c267bde8fb9501a41e Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Sun, 30 Aug 2020 17:58:08 +0200 -Subject: [PATCH] gcc-go: Use _off_t type instead of _loff_t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Taken from Adélie Linux. ---- - libgo/go/syscall/libcall_linux.go | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go -index 88286c07b6e..f8f5cfb5011 100644 ---- a/libgo/go/syscall/libcall_linux.go -+++ b/libgo/go/syscall/libcall_linux.go -@@ -206,19 +206,19 @@ func Gettid() (tid int) { - //sys Setxattr(path string, attr string, data []byte, flags int) (err error) - //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int - --//sys splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error) --//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t -+//sys splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error) -+//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t - func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) { -- var lroff _loff_t -- var plroff *_loff_t -+ var lroff _off_t -+ var plroff *_off_t - if roff != nil { -- lroff = _loff_t(*roff) -+ lroff = _off_t(*roff) - plroff = &lroff - } -- var lwoff _loff_t -- var plwoff *_loff_t -+ var lwoff _off_t -+ var plwoff *_off_t - if woff != nil { -- lwoff = _loff_t(*woff) -+ lwoff = _off_t(*woff) - plwoff = &lwoff - } - n, err = splice(rfd, plroff, wfd, plwoff, len, flags) --- -2.31.1 - diff --git a/repo/devel/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch b/repo/devel/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch deleted file mode 100644 index 5f2cb2d..0000000 --- a/repo/devel/gcc/0029-gcc-go-Don-t-include-sys-user.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40322de36043aaa3cbb98d7f01037f53fc1b5a98 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Sun, 30 Aug 2020 17:58:21 +0200 -Subject: [PATCH] gcc-go: Don't include sys/user.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Taken from Adélie Linux. ---- - libgo/sysinfo.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c -index 0692fd41eb7..c8d987358d9 100644 ---- a/libgo/sysinfo.c -+++ b/libgo/sysinfo.c -@@ -73,9 +73,6 @@ - #include - #include - #include --#if defined(HAVE_SYS_USER_H) --#include --#endif - #if defined(HAVE_SYS_UTSNAME_H) - #include - #endif --- -2.31.1 - diff --git a/repo/devel/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch b/repo/devel/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch deleted file mode 100644 index 37fa522..0000000 --- a/repo/devel/gcc/0030-gcc-go-Fix-ucontext_t-on-PPC64.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f1503cf97b5a5c6f9466145f5eb1ed3b5f200119 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Sun, 30 Aug 2020 17:59:22 +0200 -Subject: [PATCH] gcc-go: Fix ucontext_t on PPC64 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Taken from Adélie Linux. ---- - libgo/runtime/go-signal.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c -index b429fdb2403..fd1c885f043 100644 ---- a/libgo/runtime/go-signal.c -+++ b/libgo/runtime/go-signal.c -@@ -224,7 +224,7 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused))) - #elif defined(__alpha__) && defined(__linux__) - ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc; - #elif defined(__PPC__) && defined(__linux__) -- ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip; -+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32]; - #elif defined(__PPC__) && defined(_AIX) - ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar; - #elif defined(__aarch64__) && defined(__linux__) --- -2.31.1 - diff --git a/repo/devel/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch b/repo/devel/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch deleted file mode 100644 index dca7043..0000000 --- a/repo/devel/gcc/0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fc950e32b9ebc2bae09604ebe630df6df454151d Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Sun, 30 Aug 2020 17:59:45 +0200 -Subject: [PATCH] gcc-go: Fix handling of signal 34 on musl -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Taken from Adélie Linux. ---- - libgo/mksigtab.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libgo/mksigtab.sh b/libgo/mksigtab.sh -index 11e4ec436bd..fe866eacb27 100644 ---- a/libgo/mksigtab.sh -+++ b/libgo/mksigtab.sh -@@ -82,7 +82,7 @@ checksig _SIGPWR '{_SigNotify, "SIGPWR: power failure restart"}' - checksig _SIGEMT '{_SigThrow, "SIGEMT: emulate instruction executed"}' - checksig _SIGINFO '{_SigNotify, "SIGINFO: status request from keyboard"}' - checksig _SIGTHR '{_SigNotify, "SIGTHR: reserved"}' --checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}' -+#checksig _SIGPOLL '{_SigNotify, "SIGPOLL: pollable event occurred"}' - checksig _SIGWAITING '{_SigNotify, "SIGWAITING: reserved signal no longer used by"}' - checksig _SIGLWP '{_SigNotify, "SIGLWP: reserved signal no longer used by"}' - checksig _SIGFREEZE '{_SigNotify, "SIGFREEZE: special signal used by CPR"}' -@@ -95,10 +95,12 @@ checksig _SIGLOST ' {_SigNotify, "SIGLOST: resource lost (Sun); server died (G - - # Special handling of signals 32 and 33 on GNU/Linux systems, - # because they are special to glibc. -+# Signal 34 is additionally special to Linux systems with musl. - if test "${GOOS}" = "linux"; then -- SIGLIST=$SIGLIST"_32__33_" -+ SIGLIST=$SIGLIST"_32__33__34_" - echo ' 32: {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */' - echo ' 33: {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */' -+ echo ' 34: {_SigSetStack + _SigUnblock, "signal 34"}, /* see issue 30062 */' - fi - - if test "${GOOS}" = "aix"; then --- -2.31.1 - diff --git a/repo/devel/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch b/repo/devel/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch deleted file mode 100644 index 918d6b0..0000000 --- a/repo/devel/gcc/0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3be2284d92c560204e9eddb20db56d57fe584360 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Sun, 30 Aug 2020 18:01:03 +0200 -Subject: [PATCH] gcc-go: Use int64 type as offset argument for mmap -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Taken from Adélie Linux. ---- - libgo/go/runtime/mem_gccgo.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgo/go/runtime/mem_gccgo.go b/libgo/go/runtime/mem_gccgo.go -index ba38ebaa9ab..3c9e5ce9461 100644 ---- a/libgo/go/runtime/mem_gccgo.go -+++ b/libgo/go/runtime/mem_gccgo.go -@@ -15,7 +15,7 @@ import ( - //go:linkname sysFree - - //extern mmap --func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer -+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer - - //extern munmap - func munmap(addr unsafe.Pointer, length uintptr) int32 -@@ -37,7 +37,7 @@ func init() { - } - } - --func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) { -+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) { - p := sysMmap(addr, n, prot, flags, fd, off) - if uintptr(p) == _MAP_FAILED { - return nil, errno() --- -2.31.1 - diff --git a/repo/devel/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch b/repo/devel/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch deleted file mode 100644 index abb3f3f..0000000 --- a/repo/devel/gcc/0035-gcc-go-Prefer-_off_t-over-_off64_t.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 382d4516db8a7c183e9d7b5ec16a9bc175523ac9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Sun, 30 Aug 2020 19:26:53 +0200 -Subject: [PATCH] gcc-go: Prefer _off_t over _off64_t - -musl does not seem to have _off64_t. ---- - libgo/mksysinfo.sh | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh -index 972e2c379bc..8d6da15f983 100755 ---- a/libgo/mksysinfo.sh -+++ b/libgo/mksysinfo.sh -@@ -379,11 +379,7 @@ fi - # Some basic types. - echo 'type Size_t _size_t' >> ${OUT} - echo "type Ssize_t _ssize_t" >> ${OUT} --if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then -- echo "type Offset_t _off64_t" >> ${OUT} --else -- echo "type Offset_t _off_t" >> ${OUT} --fi -+echo "type Offset_t _off_t" >> ${OUT} - echo "type Mode_t _mode_t" >> ${OUT} - echo "type Pid_t _pid_t" >> ${OUT} - echo "type Uid_t _uid_t" >> ${OUT} --- -2.31.1 - diff --git a/repo/devel/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch b/repo/devel/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch deleted file mode 100644 index 0e17708..0000000 --- a/repo/devel/gcc/0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 79d8ab42aefb1d3c5f794f51df643ab040c30e30 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Sun, 30 Aug 2020 19:27:51 +0200 -Subject: [PATCH] gcc-go: undef SETCONTEXT_CLOBBERS_TLS in proc.c - ---- - libgo/runtime/proc.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c -index 6f7d2e27996..5afd7902497 100644 ---- a/libgo/runtime/proc.c -+++ b/libgo/runtime/proc.c -@@ -66,6 +66,10 @@ static void gscanstack(G*); - - __thread G *g __asm__(GOSYM_PREFIX "runtime.g"); - -+/* libucontext does not seem to support tlsbase, undef the macro -+ * here to make sure we define initcontext and fixcontext as dummies. */ -+#undef SETCONTEXT_CLOBBERS_TLS -+ - #ifndef SETCONTEXT_CLOBBERS_TLS - - static inline void --- -2.31.1 - diff --git a/repo/devel/gcc/0037-gcc-go-link-to-libucontext.patch b/repo/devel/gcc/0037-gcc-go-link-to-libucontext.patch deleted file mode 100644 index b81d8bf..0000000 --- a/repo/devel/gcc/0037-gcc-go-link-to-libucontext.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d42de24395e4f07cf6412896d4cd8c7f83a9b875 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" -Date: Mon, 31 Aug 2020 08:59:40 +0200 -Subject: [PATCH] gcc-go: link to libucontext - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 63627db68cf..c7f1f84d683 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -48823,7 +48823,7 @@ configure-target-libgo: - esac; \ - module_srcdir=libgo; \ - rm -f no-such-file || : ; \ -- CONFIG_SITE=no-such-file $(SHELL) \ -+ CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \ - $$s/$$module_srcdir/configure \ - --srcdir=$${topdir}/$$module_srcdir \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --- -2.31.1 - diff --git a/repo/devel/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch b/repo/devel/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch deleted file mode 100644 index 15acfdb..0000000 --- a/repo/devel/gcc/0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 570cd2b596daf12e8dfe1a444fe405a7c26fc2bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Mon, 31 Aug 2020 20:26:56 +0200 -Subject: [PATCH] gcc-go: Disable printing of unaccessible ppc64 struct members - -These struct members do not seem to exist on musl. ---- - libgo/runtime/go-signal.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgo/runtime/go-signal.c b/libgo/runtime/go-signal.c -index fd1c885f043..e845e453332 100644 ---- a/libgo/runtime/go-signal.c -+++ b/libgo/runtime/go-signal.c -@@ -333,7 +333,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u - runtime_printf("sp %X\n", m->sc_regs[30]); - runtime_printf("pc %X\n", m->sc_pc); - } --#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__) -+#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__) - { - mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext; - int i; --- -2.31.1 - diff --git a/repo/devel/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch b/repo/devel/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch deleted file mode 100644 index 222513d..0000000 --- a/repo/devel/gcc/0041-Use-generic-errstr.go-implementation-on-musl.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 70d70a1106b31ab840dbf5361312af221a2d5f04 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Mon, 19 Apr 2021 07:21:41 +0200 -Subject: [PATCH] Use generic errstr.go implementation on musl - -glibc provides two version of strerror_r() depending on a feature test -macro. The first is the XSI-compliant version which returns an int, the -second is GNU-specific and returns a char pointer. - -Similarity, gcc's libgo provides two implementations of Errstr() both of -which use strerror_r(). On Linux, it is assumed that the GNU-specific -strerror_r version is used. However, musl only provides the -XSI-compliant version of strerror_r. This patch enables the generic -Errstr() implementation which also uses the XSI-compliant version of -strerror_r. ---- - libgo/go/syscall/errstr.go | 1 - - libgo/go/syscall/errstr_glibc.go | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/libgo/go/syscall/errstr.go b/libgo/go/syscall/errstr.go -index 6c2441d364d..8f7c5538163 100644 ---- a/libgo/go/syscall/errstr.go -+++ b/libgo/go/syscall/errstr.go -@@ -5,7 +5,6 @@ - // license that can be found in the LICENSE file. - - // +build !hurd --// +build !linux - - package syscall - -diff --git a/libgo/go/syscall/errstr_glibc.go b/libgo/go/syscall/errstr_glibc.go -index 5b19e6f202d..8dc60172186 100644 ---- a/libgo/go/syscall/errstr_glibc.go -+++ b/libgo/go/syscall/errstr_glibc.go -@@ -7,7 +7,7 @@ - // We use this rather than errstr.go because on GNU/Linux sterror_r - // returns a pointer to the error message, and may not use buf at all. - --// +build hurd linux -+// +build hurd !linux - - package syscall - --- -2.31.1 - diff --git a/repo/devel/gcc/0042-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch b/repo/devel/gcc/0042-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch deleted file mode 100644 index 96deb51..0000000 --- a/repo/devel/gcc/0042-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Alpine Linux community -From: Olsken (updated patches) -Date: Sat, 21 Aug 2021 08:51:52 +0000 - -diff --git a/gcc/gcc.c b/gcc/gcc.c -index bc1bd1686..b5c83977f 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -1005,6 +1005,12 @@ proper position among the other output files. */ - #define NO_SSP_SPEC "" - #endif - -+#ifdef ENABLE_DEFAULT_SSP -+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} " -+#else -+#define NO_SSP_SPEC "" -+#endif -+ - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP - #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ diff --git a/repo/devel/gcc/0043-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch b/repo/devel/gcc/0043-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch deleted file mode 100644 index 762c6ef..0000000 --- a/repo/devel/gcc/0043-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Alpine Linux community -From: Olsken (updated patches) -Date: Sat, 21 Aug 2021 08:51:52 +0000 - -diff --git a/gcc/config.in b/gcc/config.in -index d0287d4cc..8c10816c4 100644 ---- a/gcc/config.in -+++ b/gcc/config.in -@@ -112,6 +112,12 @@ - #endif - - -+/* Define if libatomic should always be linked. */ -+#ifndef USED_FOR_TARGET -+#undef ENABLE_AUTOLINK_LIBATOMIC -+#endif -+ -+ - /* Define to 1 to specify that we are using the BID decimal floating point - format instead of DPD */ - #ifndef USED_FOR_TARGET diff --git a/repo/devel/gcc/gcc.xibuild b/repo/devel/gcc/gcc.xibuild deleted file mode 100644 index a5e294d..0000000 --- a/repo/devel/gcc/gcc.xibuild +++ /dev/null @@ -1,202 +0,0 @@ -#!/bin/sh - -MAKEDEPS="grep make dejagnu flex" -DEPS="zstd musl binutils mpc mpfr gmp libstdc++ libgcc" - - -PKG_VER=11.2.0 -SOURCE=https://ftp.gnu.org/gnu/gcc/gcc-$PKG_VER/gcc-$PKG_VER.tar.xz - -ISL_VER=0.24 -PATCH_SRC="https://raw.githubusercontent.com/dslm4515/Musl-LFS/master/patches/gcc-alpine" - -ADDITIONAL=" - https://libisl.sourceforge.io/isl-$ISL_VER.tar.xz - - 0001-posix_memalign.patch - 0003-Turn-on-Wl-z-relro-z-now-by-default.patch - 0004-Turn-on-D_FORTIFY_SOURCE-2-by-default-for-C-C-ObjC-O.patch - 0006-Enable-Wformat-and-Wformat-security-by-default.patch - 0007-Enable-Wtrampolines-by-default.patch - 0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch - 0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch - 0012-libitm-disable-FORTIFY.patch - 0013-libgcc_s.patch - 0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch - 0016-dlang-update-zlib-binding.patch - 0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch - 0018-ada-fix-shared-linking.patch - 0019-build-fix-CXXFLAGS_FOR_BUILD-passing.patch - 0020-add-fortify-headers-paths.patch - 0023-Pure-64-bit-MIPS.patch - 0024-use-pure-64-bit-configuration-where-appropriate.patch - 0025-always-build-libgcc_eh.a.patch - 0027-ada-musl-support-fixes.patch - 0028-gcc-go-Use-_off_t-type-instead-of-_loff_t.patch - 0029-gcc-go-Don-t-include-sys-user.h.patch - 0030-gcc-go-Fix-ucontext_t-on-PPC64.patch - 0031-gcc-go-Fix-handling-of-signal-34-on-musl.patch - 0032-gcc-go-Use-int64-type-as-offset-argument-for-mmap.patch - 0035-gcc-go-Prefer-_off_t-over-_off64_t.patch - 0036-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch - 0037-gcc-go-link-to-libucontext.patch - 0038-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch - 0041-Use-generic-errstr.go-implementation-on-musl.patch - 0042-Disable-ssp-on-nostdlib-nodefaultlibs-and-ffreestand.patch - 0043-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch - 0021-Alpine-musl-package-provides-libssp_nonshared.a.-We-.patch - getconf.1 - getconf.c - getent.1 - getent.c - iconv.c -" - -DESC="The GNU Compiler Collection - C and C++ frontends" - -prepare () { - export languages="c,c++,lto" - - case $(uname -m) in - x86_64) export TRUPLE="x86_64-linux-musl" - export EXTRA_CONFIG=" --with-arch=x86-64" - ;; - i686) export TRUPLE="i686-linux-musl" - export EXTRA_CONFIG=" --with-arch=pentium3 --with-tune=pentium-m" - ;; - armv7l) export TRUPLE="armv7l-linux-musleabihf" - export EXTRA_CONFIG=" --with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb" - ;; - armv6l) export TRUPLE="armv6l-linux-musleabihf" - export EXTRA_CONFIG=" --with-arch=armv6zk --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard --with-abi=aapcs-linux" - ;; - aarch64) export TRUPLE="aarch64-linux-musleabihf" - export EXTRA_CONFIG=" --with-arch=armv8-a --with-abi=lp64 --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419" - sed -i '/m64=/s/lib64/lib/' gcc/config/aarch64/t-aarch64-linux - ;; - esac - - tar xf isl-$ISL_VER.tar.xz - mv isl-$ISL_VER isl - - apply_patches -} - -build () { - mkdir build - cd build - - export NOFF="--disable-libstdcxx-pch - --disable-nls - --disable-multilib - --disable-bootstrap - --disable-symvers - --disable-libsanitizer - --disable-libmpx - --disable-libmudflap - --disable-fixed-point - --disable-sjlj-exceptions - --disable-werror " - - # Enable graphite - export XCONFIG="--with-ppl=yes --with-cloog=yes " - - # Enable features for x86_64 - export XTRA86="--with-arch=x86-64 " - - # Enable features - export FON="--enable-threads=posix - --enable-clocale=generic - --enable-tls - --enable-libstdcxx-time - --enable-fully-dynamic-string - --enable-linker-build-id - --enable-checking=release - --enable-cloog-backend - --enable-__cxa_atexit - --enable-lto - --enable-plugins - --with-system-zlib - --with-linker-hash-style=gnu " - #export FON+="--with-isl " - - # Configure source - SED=sed libat_cv_have_ifunc=no \ - ../configure --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-pkgversion="XiLinux $PKG_VER" \ - --enable-checking=release \ - --disable-fixed-point \ - --disable-libstdcxx-pch \ - --disable-multilib \ - --disable-nls \ - --disable-werror \ - --enable-__cxa_atexit \ - --enable-default-pie \ - --enable-cloog-backend \ - --enable-languages=$languages \ - --with-system-zlib \ - --target=${TRUPLE} \ - $NOFF $XTRA86 $XCONFIG $FON && - - make && - - cd .. && - cc getent.c -o getent && - cc getconf.c -o getconf && - cc iconv.c -o iconv -} - -check () { - cd build - if id -u tester; then - chown -R tester . - su tester -c "PATH=$PATH make $MAKEFLAGS -k check" || true - ../contrib/test_summary | grep -A7 Summ || true - fi - cd .. -} - - -package () { - - # create specsfile - export SPECFILE=$PKG_DEST`dirname $(gcc -print-libgcc-file-name)`/specs -gcc -dumpspecs | sed -e 's@/tools@@g' \ - -e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \ - -e '/\*cpp:/{n;s@$@ -isystem /usr/include@}' > tempspecfile - mv -f tempspecfile $SPECFILE && - unset SPECFILE MLFS_TARGET - - - - install -dm755 $PKG_DEST/usr/bin - install -dm755 $PKG_DEST/usr/share/man - install -dm755 $PKG_DEST/usr/lib/bfd-plugins - - cd build - make DESTDIR=$PKG_DEST install - cd .. - - cp getent $PKG_DEST/usr/bin/ - cp getconf $PKG_DEST/usr/bin/ - cp iconv $PKG_DEST/usr/bin/ - cp getent.1 $PKG_DEST/usr/share/man/man1/ - cp getconf.1 $PKG_DEST/usr/share/man/man1/ - - ln -s ../bin/cpp $PKG_DEST/usr/lib - ln -s gcc $PKG_DEST/usr/bin/cc - - ln -sf ../../libexec/gcc/$(gcc -dumpmachine)/$PKG_VER/liblto_plugin.so \ - $PKG_VER/usr/lib/bfd-plugins/ - - mkdir -p $PKG_DEST/usr/share/gdb/auto-load/usr/lib - #mv $PKG_DEST/usr/lib/*gdb.py $PKG_DEST/usr/share/gdb/auto-load/usr/lib - - for p in gcov gcc-ar gcc gcc-ranlib c++ g++ gcc-nm lto-dump gcov-tools gcov-dump cpp; do - ln -s $TRUPLE-$p $PKG_DEST/usr/bin/$p - done - - -} diff --git a/repo/devel/gcc/getconf.1 b/repo/devel/gcc/getconf.1 deleted file mode 100644 index 520a688..0000000 --- a/repo/devel/gcc/getconf.1 +++ /dev/null @@ -1,94 +0,0 @@ -.\" $NetBSD: getconf.1,v 1.13 2014/04/13 01:45:34 snj Exp $ -.\" -.\" Copyright (c) 1996 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" This code is derived from software contributed to The NetBSD Foundation -.\" by J.T. Conklin. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd August 9, 2011 -.Dt GETCONF 1 -.Os -.Sh NAME -.Nm getconf -.Nd get configuration values -.Sh SYNOPSIS -.Nm -.Ar system_var -.Nm -.Fl a -.Nm -.Ar path_var -.Ar pathname -.Nm -.Fl a -.Ar pathname -.Sh DESCRIPTION -The -.Nm -utility writes the current value of a configurable system limit or -option variable to the standard output. -.Pp -The -.Ar system_var -argument specifies the system variable to be queried. -The names of the system variables are from -.Xr sysconf 3 -with the leading -.Dq Li _SC_ -removed. -.Pp -The -.Ar path_var -argument specifies the pathname variable to be queried for the specified -.Ar pathname -argument. -The names of the pathname variables are from -.Xr pathconf 2 -with the leading -.Dq Li _PC_ -removed. -.Pp -When invoked with the option -.Fl a , -.Nm -writes a list of all applicable variables and their values to the -standard output, in the format -.Do -.Va name -= -.Va value -.Dc . -.Sh EXIT STATUS -.Ex -std -.Sh SEE ALSO -.Xr pathconf 2 , -.Xr confstr 3 , -.Xr limits 3 , -.Xr sysconf 3 -.Sh STANDARDS -The -.Nm -utility conforms to -.St -p1003.2-92 . diff --git a/repo/devel/gcc/getconf.c b/repo/devel/gcc/getconf.c deleted file mode 100644 index c423524..0000000 --- a/repo/devel/gcc/getconf.c +++ /dev/null @@ -1,338 +0,0 @@ -/*- - * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by J.T. Conklin. - * - * Mostly rewritten to be used in Alpine Linux (with musl c-library) - * by Timo Teräs. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct conf_variable { - const char *name; - enum { SYSCONF, CONFSTR, PATHCONF, CONSTANT, UCONSTANT, NUM_TYPES } type; - long value; -}; - -static const struct conf_variable conf_table[] = { -{ "PATH", CONFSTR, _CS_PATH }, - -/* Utility Limit Minimum Values */ -{ "POSIX2_BC_BASE_MAX", CONSTANT, _POSIX2_BC_BASE_MAX }, -{ "POSIX2_BC_DIM_MAX", CONSTANT, _POSIX2_BC_DIM_MAX }, -{ "POSIX2_BC_SCALE_MAX", CONSTANT, _POSIX2_BC_SCALE_MAX }, -{ "POSIX2_BC_STRING_MAX", CONSTANT, _POSIX2_BC_STRING_MAX }, -{ "POSIX2_COLL_WEIGHTS_MAX", CONSTANT, _POSIX2_COLL_WEIGHTS_MAX }, -{ "POSIX2_EXPR_NEST_MAX", CONSTANT, _POSIX2_EXPR_NEST_MAX }, -{ "POSIX2_LINE_MAX", CONSTANT, _POSIX2_LINE_MAX }, -{ "POSIX2_RE_DUP_MAX", CONSTANT, _POSIX2_RE_DUP_MAX }, -{ "POSIX2_VERSION", CONSTANT, _POSIX2_VERSION }, - -/* POSIX.1 Minimum Values */ -{ "_POSIX_AIO_LISTIO_MAX", CONSTANT, _POSIX_AIO_LISTIO_MAX }, -{ "_POSIX_AIO_MAX", CONSTANT, _POSIX_AIO_MAX }, -{ "_POSIX_ARG_MAX", CONSTANT, _POSIX_ARG_MAX }, -{ "_POSIX_CHILD_MAX", CONSTANT, _POSIX_CHILD_MAX }, -{ "_POSIX_LINK_MAX", CONSTANT, _POSIX_LINK_MAX }, -{ "_POSIX_MAX_CANON", CONSTANT, _POSIX_MAX_CANON }, -{ "_POSIX_MAX_INPUT", CONSTANT, _POSIX_MAX_INPUT }, -{ "_POSIX_MQ_OPEN_MAX", CONSTANT, _POSIX_MQ_OPEN_MAX }, -{ "_POSIX_MQ_PRIO_MAX", CONSTANT, _POSIX_MQ_PRIO_MAX }, -{ "_POSIX_NAME_MAX", CONSTANT, _POSIX_NAME_MAX }, -{ "_POSIX_NGROUPS_MAX", CONSTANT, _POSIX_NGROUPS_MAX }, -{ "_POSIX_OPEN_MAX", CONSTANT, _POSIX_OPEN_MAX }, -{ "_POSIX_PATH_MAX", CONSTANT, _POSIX_PATH_MAX }, -{ "_POSIX_PIPE_BUF", CONSTANT, _POSIX_PIPE_BUF }, -{ "_POSIX_SSIZE_MAX", CONSTANT, _POSIX_SSIZE_MAX }, -{ "_POSIX_STREAM_MAX", CONSTANT, _POSIX_STREAM_MAX }, -{ "_POSIX_TZNAME_MAX", CONSTANT, _POSIX_TZNAME_MAX }, - -/* Symbolic Utility Limits */ -{ "BC_BASE_MAX", SYSCONF, _SC_BC_BASE_MAX }, -{ "BC_DIM_MAX", SYSCONF, _SC_BC_DIM_MAX }, -{ "BC_SCALE_MAX", SYSCONF, _SC_BC_SCALE_MAX }, -{ "BC_STRING_MAX", SYSCONF, _SC_BC_STRING_MAX }, -{ "COLL_WEIGHTS_MAX", SYSCONF, _SC_COLL_WEIGHTS_MAX }, -{ "EXPR_NEST_MAX", SYSCONF, _SC_EXPR_NEST_MAX }, -{ "LINE_MAX", SYSCONF, _SC_LINE_MAX }, -{ "RE_DUP_MAX", SYSCONF, _SC_RE_DUP_MAX }, - -/* Optional Facility Configuration Values */ -{ "_POSIX2_C_BIND", SYSCONF, _SC_2_C_BIND }, -{ "POSIX2_C_DEV", SYSCONF, _SC_2_C_DEV }, -{ "POSIX2_CHAR_TERM", SYSCONF, _SC_2_CHAR_TERM }, -{ "POSIX2_FORT_DEV", SYSCONF, _SC_2_FORT_DEV }, -{ "POSIX2_FORT_RUN", SYSCONF, _SC_2_FORT_RUN }, -{ "POSIX2_LOCALEDEF", SYSCONF, _SC_2_LOCALEDEF }, -{ "POSIX2_SW_DEV", SYSCONF, _SC_2_SW_DEV }, -{ "POSIX2_UPE", SYSCONF, _SC_2_UPE }, - -/* POSIX.1 Configurable System Variables */ -{ "AIO_LISTIO_MAX", SYSCONF, _SC_AIO_LISTIO_MAX }, -{ "AIO_MAX", SYSCONF, _SC_AIO_MAX }, -{ "ARG_MAX", SYSCONF, _SC_ARG_MAX }, -{ "CHILD_MAX", SYSCONF, _SC_CHILD_MAX }, -{ "CLK_TCK", SYSCONF, _SC_CLK_TCK }, -{ "MQ_OPEN_MAX", SYSCONF, _SC_MQ_OPEN_MAX }, -{ "MQ_PRIO_MAX", SYSCONF, _SC_MQ_PRIO_MAX }, -{ "NGROUPS_MAX", SYSCONF, _SC_NGROUPS_MAX }, -{ "OPEN_MAX", SYSCONF, _SC_OPEN_MAX }, -{ "STREAM_MAX", SYSCONF, _SC_STREAM_MAX }, -{ "TZNAME_MAX", SYSCONF, _SC_TZNAME_MAX }, -{ "_POSIX_JOB_CONTROL", SYSCONF, _SC_JOB_CONTROL }, -{ "_POSIX_SAVED_IDS", SYSCONF, _SC_SAVED_IDS }, -{ "_POSIX_VERSION", SYSCONF, _SC_VERSION }, - -{ "LINK_MAX", PATHCONF, _PC_LINK_MAX }, -{ "MAX_CANON", PATHCONF, _PC_MAX_CANON }, -{ "MAX_INPUT", PATHCONF, _PC_MAX_INPUT }, -{ "NAME_MAX", PATHCONF, _PC_NAME_MAX }, -{ "PATH_MAX", PATHCONF, _PC_PATH_MAX }, -{ "PIPE_BUF", PATHCONF, _PC_PIPE_BUF }, -{ "_POSIX_CHOWN_RESTRICTED", PATHCONF, _PC_CHOWN_RESTRICTED }, -{ "_POSIX_NO_TRUNC", PATHCONF, _PC_NO_TRUNC }, -{ "_POSIX_VDISABLE", PATHCONF, _PC_VDISABLE }, - -/* POSIX.1b Configurable System Variables */ -{ "PAGESIZE", SYSCONF, _SC_PAGESIZE }, -{ "_POSIX_ASYNCHRONOUS_IO", SYSCONF, _SC_ASYNCHRONOUS_IO }, -{ "_POSIX_FSYNC", SYSCONF, _SC_FSYNC }, -{ "_POSIX_MAPPED_FILES", SYSCONF, _SC_MAPPED_FILES }, -{ "_POSIX_MEMLOCK", SYSCONF, _SC_MEMLOCK }, -{ "_POSIX_MEMLOCK_RANGE", SYSCONF, _SC_MEMLOCK_RANGE }, -{ "_POSIX_MEMORY_PROTECTION", SYSCONF, _SC_MEMORY_PROTECTION }, -{ "_POSIX_MESSAGE_PASSING", SYSCONF, _SC_MESSAGE_PASSING }, -{ "_POSIX_MONOTONIC_CLOCK", SYSCONF, _SC_MONOTONIC_CLOCK }, -{ "_POSIX_PRIORITY_SCHEDULING", SYSCONF, _SC_PRIORITY_SCHEDULING }, -{ "_POSIX_SEMAPHORES", SYSCONF, _SC_SEMAPHORES }, -{ "_POSIX_SHARED_MEMORY_OBJECTS", SYSCONF, _SC_SHARED_MEMORY_OBJECTS }, -{ "_POSIX_SYNCHRONIZED_IO", SYSCONF, _SC_SYNCHRONIZED_IO }, -{ "_POSIX_TIMERS", SYSCONF, _SC_TIMERS }, - -{ "_POSIX_SYNC_IO", PATHCONF, _PC_SYNC_IO }, - -/* POSIX.1c Configurable System Variables */ -{ "LOGIN_NAME_MAX", SYSCONF, _SC_LOGIN_NAME_MAX }, -{ "_POSIX_THREADS", SYSCONF, _SC_THREADS }, - -/* POSIX.1j Configurable System Variables */ -{ "_POSIX_BARRIERS", SYSCONF, _SC_BARRIERS }, -{ "_POSIX_READER_WRITER_LOCKS", SYSCONF, _SC_READER_WRITER_LOCKS }, -{ "_POSIX_SPIN_LOCKS", SYSCONF, _SC_SPIN_LOCKS }, - -/* XPG4.2 Configurable System Variables */ -{ "IOV_MAX", SYSCONF, _SC_IOV_MAX }, -{ "PAGE_SIZE", SYSCONF, _SC_PAGE_SIZE }, -{ "_XOPEN_SHM", SYSCONF, _SC_XOPEN_SHM }, - -/* X/Open CAE Spec. Issue 5 Version 2 Configurable System Variables */ -{ "FILESIZEBITS", PATHCONF, _PC_FILESIZEBITS }, - -/* POSIX.1-2001 XSI Option Group Configurable System Variables */ -{ "ATEXIT_MAX", SYSCONF, _SC_ATEXIT_MAX }, - -/* POSIX.1-2001 TSF Configurable System Variables */ -{ "GETGR_R_SIZE_MAX", SYSCONF, _SC_GETGR_R_SIZE_MAX }, -{ "GETPW_R_SIZE_MAX", SYSCONF, _SC_GETPW_R_SIZE_MAX }, - -/* Commonly provided extensions */ -{ "_PHYS_PAGES", SYSCONF, _SC_PHYS_PAGES }, -{ "_AVPHYS_PAGES", SYSCONF, _SC_AVPHYS_PAGES }, -{ "_NPROCESSORS_CONF", SYSCONF, _SC_NPROCESSORS_CONF }, -{ "_NPROCESSORS_ONLN", SYSCONF, _SC_NPROCESSORS_ONLN }, - -/* Data type related extensions */ -{ "CHAR_BIT", CONSTANT, CHAR_BIT }, -{ "CHAR_MAX", CONSTANT, CHAR_MAX }, -{ "CHAR_MIN", CONSTANT, CHAR_MIN }, -{ "INT_MAX", CONSTANT, INT_MAX }, -{ "INT_MIN", CONSTANT, INT_MIN }, -{ "LONG_BIT", CONSTANT, LONG_BIT }, -{ "LONG_MAX", CONSTANT, LONG_MAX }, -{ "LONG_MIN", CONSTANT, LONG_MIN }, -{ "SCHAR_MAX", CONSTANT, SCHAR_MAX }, -{ "SCHAR_MIN", CONSTANT, SCHAR_MIN }, -{ "SHRT_MAX", CONSTANT, SHRT_MAX }, -{ "SHRT_MIN", CONSTANT, SHRT_MIN }, -{ "SSIZE_MAX", CONSTANT, SSIZE_MAX }, -{ "UCHAR_MAX", UCONSTANT, (long) UCHAR_MAX }, -{ "UINT_MAX", UCONSTANT, (long) UINT_MAX }, -{ "ULONG_MAX", UCONSTANT, (long) ULONG_MAX }, -{ "USHRT_MAX", UCONSTANT, (long) USHRT_MAX }, -{ "WORD_BIT", CONSTANT, WORD_BIT }, - -{ NULL, CONSTANT, 0L } -}; - -static int all = 0; - -static void usage(const char *p) -{ - (void)fprintf(stderr, "Usage: %s system_var\n\t%s -a\n" - "\t%s path_var pathname\n\t%s -a pathname\n", p, p, p, p); - exit(EXIT_FAILURE); -} - -static void print_long(const char *name, long val) -{ - if (all) printf("%s = %ld\n", name, val); - else printf("%ld\n", val); -} - -static void print_ulong(const char *name, unsigned long val) -{ - if (all) printf("%s = %lu\n", name, val); - else printf("%lu\n", val); -} - -static void print_string(const char *name, const char *val) -{ - if (all) printf("%s = %s\n", name, val); - else printf("%s\n", val); -} - -static int print_constant(const struct conf_variable *cp, const char *pathname) -{ - print_long(cp->name, cp->value); - return 0; -} - -static int print_uconstant(const struct conf_variable *cp, const char *pathname) -{ - print_ulong(cp->name, (unsigned long) cp->value); - return 0; -} - -static int print_sysconf(const struct conf_variable *cp, const char *pathname) -{ - long val; - - errno = 0; - if ((val = sysconf((int)cp->value)) == -1) { - if (errno != 0) err(EXIT_FAILURE, "sysconf(%ld)", cp->value); - return -1; - } - print_long(cp->name, val); - return 0; -} - -static int print_confstr(const struct conf_variable *cp, const char *pathname) -{ - size_t len; - char *val; - - errno = 0; - if ((len = confstr((int)cp->value, NULL, 0)) == 0) goto error; - if ((val = malloc(len)) == NULL) err(EXIT_FAILURE, "Can't allocate %zu bytes", len); - errno = 0; - if (confstr((int)cp->value, val, len) == 0) goto error; - print_string(cp->name, val); - free(val); - return 0; -error: - if (errno != EINVAL) err(EXIT_FAILURE, "confstr(%ld)", cp->value); - return -1; -} - -static int print_pathconf(const struct conf_variable *cp, const char *pathname) -{ - long val; - - errno = 0; - if ((val = pathconf(pathname, (int)cp->value)) == -1) { - if (all && errno == EINVAL) return 0; - if (errno != 0) err(EXIT_FAILURE, "pathconf(%s, %ld)", pathname, cp->value); - return -1; - } - print_long(cp->name, val); - return 0; -} - -typedef int (*handler_t)(const struct conf_variable *cp, const char *pathname); -static const handler_t type_handlers[NUM_TYPES] = { - [SYSCONF] = print_sysconf, - [CONFSTR] = print_confstr, - [PATHCONF] = print_pathconf, - [CONSTANT] = print_constant, - [UCONSTANT] = print_uconstant, -}; - -int main(int argc, char **argv) -{ - const char *progname = argv[0]; - const struct conf_variable *cp; - const char *varname, *pathname; - int ch, found = 0; - - (void)setlocale(LC_ALL, ""); - while ((ch = getopt(argc, argv, "a")) != -1) { - switch (ch) { - case 'a': - all = 1; - break; - case '?': - default: - usage(progname); - } - } - argc -= optind; - argv += optind; - - if (!all) { - if (argc == 0) - usage(progname); - varname = argv[0]; - argc--; - argv++; - } else - varname = NULL; - - if (argc > 1) - usage(progname); - pathname = argv[0]; /* may be NULL */ - - for (cp = conf_table; cp->name != NULL; cp++) { - if (!all && strcmp(varname, cp->name) != 0) continue; - if ((cp->type == PATHCONF) == (pathname != NULL)) { - if (type_handlers[cp->type](cp, pathname) < 0) - print_string(cp->name, "undefined"); - found = 1; - } else if (!all) - errx(EXIT_FAILURE, "%s: invalid variable type", cp->name); - } - if (!all && !found) errx(EXIT_FAILURE, "%s: unknown variable", varname); - (void)fflush(stdout); - return ferror(stdout) ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/repo/devel/gcc/getent.1 b/repo/devel/gcc/getent.1 deleted file mode 100644 index 0e07058..0000000 --- a/repo/devel/gcc/getent.1 +++ /dev/null @@ -1,145 +0,0 @@ -.\" $NetBSD: getent.1,v 1.23 2011/10/11 20:39:40 wiz Exp $ -.\" -.\" Copyright (c) 2004 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" This code is derived from software contributed to The NetBSD Foundation -.\" by Luke Mewburn. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd October 11, 2011 -.Dt GETENT 1 -.Os -.Sh NAME -.Nm getent -.Nd get entries from administrative databases -.Sh SYNOPSIS -.Nm getent -.Ar database -.Op Ar key ... -.Nm getcap -.Ar database -.Op Ar key ... -.Sh DESCRIPTION -The -.Nm -program retrieves and displays entries from the administrative -database specified by -.Ar database , -using the lookup order specified in -.Xr nsswitch.conf 5 . -The display format for a given -.Ar database -is as per the -.Dq traditional -file format for that database. -.Pp -.Ar database -may be one of: -.Bl -column "protocols" "user:passwd:uid:gid:gecos:home_dir:shell" -offset indent -compact -.It Sy Database Ta Sy Display format -.It disktab Ta entry -.It ethers Ta address name -.It gettytab Ta entry -.It group Ta group:passwd:gid:[member[,member]...] -.It hosts Ta address name [alias ...] -.It netgroup Ta (host,user,domain) [...] -.It networks Ta name network [alias ...] -.It passwd Ta user:passwd:uid:gid:gecos:home_dir:shell -.It printcap Ta entry -.It protocols Ta name protocol [alias ...] -.It rpc Ta name number [alias ...] -.It services Ta name port/protocol [alias ...] -.It shells Ta /path/to/shell -.El -.Pp -If one or more -.Ar key -arguments are provided, they will be looked up in -.Ar database -using the appropriate function. -For example, -.Sy passwd -supports a numeric UID or user name; -.Sy hosts -supports an IPv4 address, IPv6 address, or host name; -and -.Sy services -supports a service name, service name/protocol name, numeric port, or -numeric port/protocol name. -.Pp -If no -.Ar key -is provided and -.Ar database -supports enumeration, all entries for -.Ar database -will be retrieved using the appropriate enumeration function and printed. -.Pp -For -.Xr cgetcap 3 -style databases -.Sy ( disktab , -.Sy printcap ) -specifying a key, lists the entry for that key, and specifying more arguments -after the key are used as fields in that key, and only the values of the keys -are returned. -For boolean keys -.Dv true -is returned if the key is found. -If a key is not found, then -.Dv false -is always -returned. -.Sh DIAGNOSTICS -.Nm -exits 0 on success, -1 if there was an error in the command syntax, -2 if one of the specified key names was not found in -.Ar database , -or 3 if there is no support for enumeration on -.Ar database . -.Sh SEE ALSO -.Xr cgetcap 3 , -.Xr disktab 5 , -.Xr ethers 5 , -.Xr gettytab 5 , -.Xr group 5 , -.Xr hosts 5 , -.Xr networks 5 , -.Xr nsswitch.conf 5 , -.Xr passwd 5 , -.Xr printcap 5 , -.Xr protocols 5 , -.Xr rpc 5 , -.Xr services 5 , -.Xr shells 5 -.Sh HISTORY -A -.Nm -command appeared in -.Nx 3.0 . -It was based on the command of the same name in -.Tn Solaris -and -.Tn Linux . diff --git a/repo/devel/gcc/getent.c b/repo/devel/gcc/getent.c deleted file mode 100644 index 939b46c..0000000 --- a/repo/devel/gcc/getent.c +++ /dev/null @@ -1,437 +0,0 @@ -/*- - * Copyright (c) 2004-2006 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Luke Mewburn. - * Timo Teräs cleaned up the code for use in Alpine Linux with musl libc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -enum { - RV_OK = 0, - RV_USAGE = 1, - RV_NOTFOUND = 2, - RV_NOENUM = 3 -}; - -static int usage(const char *); - -static int parsenum(const char *word, unsigned long *result) -{ - unsigned long num; - char *ep; - - if (!isdigit((unsigned char)word[0])) - return 0; - errno = 0; - num = strtoul(word, &ep, 10); - if (num == ULONG_MAX && errno == ERANGE) - return 0; - if (*ep != '\0') - return 0; - *result = num; - return 1; -} - -/* - * printfmtstrings -- - * vprintf(format, ...), - * then the aliases (beginning with prefix, separated by sep), - * then a newline - */ -__attribute__ ((format (printf, 4, 5))) -static void printfmtstrings(char *strings[], const char *prefix, const char *sep, - const char *fmt, ...) -{ - va_list ap; - const char *curpref; - size_t i; - - va_start(ap, fmt); - (void)vprintf(fmt, ap); - va_end(ap); - - curpref = prefix; - for (i = 0; strings[i] != NULL; i++) { - (void)printf("%s%s", curpref, strings[i]); - curpref = sep; - } - (void)printf("\n"); -} - -static int ethers(int argc, char *argv[]) -{ - char hostname[MAXHOSTNAMELEN + 1], *hp; - struct ether_addr ea, *eap; - int i, rv; - - if (argc == 2) { - warnx("Enumeration not supported on ethers"); - return RV_NOENUM; - } - - rv = RV_OK; - for (i = 2; i < argc; i++) { - if ((eap = ether_aton(argv[i])) == NULL) { - eap = &ea; - hp = argv[i]; - if (ether_hostton(hp, eap) != 0) { - rv = RV_NOTFOUND; - break; - } - } else { - hp = hostname; - if (ether_ntohost(hp, eap) != 0) { - rv = RV_NOTFOUND; - break; - } - } - (void)printf("%-17s %s\n", ether_ntoa(eap), hp); - } - return rv; -} - -static void groupprint(const struct group *gr) -{ - printfmtstrings(gr->gr_mem, ":", ",", "%s:%s:%u", - gr->gr_name, gr->gr_passwd, gr->gr_gid); -} - -static int group(int argc, char *argv[]) -{ - struct group *gr; - unsigned long id; - int i, rv; - - rv = RV_OK; - if (argc == 2) { - while ((gr = getgrent()) != NULL) - groupprint(gr); - } else { - for (i = 2; i < argc; i++) { - if (parsenum(argv[i], &id)) - gr = getgrgid((gid_t)id); - else - gr = getgrnam(argv[i]); - if (gr == NULL) { - rv = RV_NOTFOUND; - break; - } - groupprint(gr); - } - } - endgrent(); - return rv; -} - -static void hostsprint(const struct hostent *he) -{ - char buf[INET6_ADDRSTRLEN]; - - if (inet_ntop(he->h_addrtype, he->h_addr, buf, sizeof(buf)) == NULL) - (void)strlcpy(buf, "# unknown", sizeof(buf)); - printfmtstrings(he->h_aliases, " ", " ", "%-16s %s", buf, he->h_name); -} - -static int hosts(int argc, char *argv[]) -{ - struct hostent *he; - char addr[IN6ADDRSZ]; - int i, rv; - - sethostent(1); - rv = RV_OK; - if (argc == 2) { - while ((he = gethostent()) != NULL) - hostsprint(he); - } else { - for (i = 2; i < argc; i++) { - if (inet_pton(AF_INET6, argv[i], (void *)addr) > 0) - he = gethostbyaddr(addr, IN6ADDRSZ, AF_INET6); - else if (inet_pton(AF_INET, argv[i], (void *)addr) > 0) - he = gethostbyaddr(addr, INADDRSZ, AF_INET); - else - he = gethostbyname(argv[i]); - if (he == NULL) { - rv = RV_NOTFOUND; - break; - } - hostsprint(he); - } - } - endhostent(); - return rv; -} - -static void networksprint(const struct netent *ne) -{ - char buf[INET6_ADDRSTRLEN]; - struct in_addr ianet; - - ianet = inet_makeaddr(ne->n_net, 0); - if (inet_ntop(ne->n_addrtype, &ianet, buf, sizeof(buf)) == NULL) - (void)strlcpy(buf, "# unknown", sizeof(buf)); - printfmtstrings(ne->n_aliases, " ", " ", "%-16s %s", ne->n_name, buf); -} - -static int networks(int argc, char *argv[]) -{ - struct netent *ne; - in_addr_t net; - int i, rv; - - setnetent(1); - rv = RV_OK; - if (argc == 2) { - while ((ne = getnetent()) != NULL) - networksprint(ne); - } else { - for (i = 2; i < argc; i++) { - net = inet_network(argv[i]); - if (net != INADDR_NONE) - ne = getnetbyaddr(net, AF_INET); - else - ne = getnetbyname(argv[i]); - if (ne == NULL) { - rv = RV_NOTFOUND; - break; - } - networksprint(ne); - } - } - endnetent(); - return rv; -} - -static void passwdprint(struct passwd *pw) -{ - (void)printf("%s:%s:%u:%u:%s:%s:%s\n", - pw->pw_name, pw->pw_passwd, pw->pw_uid, - pw->pw_gid, pw->pw_gecos, pw->pw_dir, pw->pw_shell); -} - -static int passwd(int argc, char *argv[]) -{ - struct passwd *pw; - unsigned long id; - int i, rv; - - rv = RV_OK; - if (argc == 2) { - while ((pw = getpwent()) != NULL) - passwdprint(pw); - } else { - for (i = 2; i < argc; i++) { - if (parsenum(argv[i], &id)) - pw = getpwuid((uid_t)id); - else - pw = getpwnam(argv[i]); - if (pw == NULL) { - rv = RV_NOTFOUND; - break; - } - passwdprint(pw); - } - } - endpwent(); - return rv; -} - -static void protocolsprint(struct protoent *pe) -{ - printfmtstrings(pe->p_aliases, " ", " ", - "%-16s %5d", pe->p_name, pe->p_proto); -} - -static int protocols(int argc, char *argv[]) -{ - struct protoent *pe; - unsigned long id; - int i, rv; - - setprotoent(1); - rv = RV_OK; - if (argc == 2) { - while ((pe = getprotoent()) != NULL) - protocolsprint(pe); - } else { - for (i = 2; i < argc; i++) { - if (parsenum(argv[i], &id)) - pe = getprotobynumber((int)id); - else - pe = getprotobyname(argv[i]); - if (pe == NULL) { - rv = RV_NOTFOUND; - break; - } - protocolsprint(pe); - } - } - endprotoent(); - return rv; -} - -static void servicesprint(struct servent *se) -{ - printfmtstrings(se->s_aliases, " ", " ", - "%-16s %5d/%s", - se->s_name, ntohs(se->s_port), se->s_proto); - -} - -static int services(int argc, char *argv[]) -{ - struct servent *se; - unsigned long id; - char *proto; - int i, rv; - - setservent(1); - rv = RV_OK; - if (argc == 2) { - while ((se = getservent()) != NULL) - servicesprint(se); - } else { - for (i = 2; i < argc; i++) { - proto = strchr(argv[i], '/'); - if (proto != NULL) - *proto++ = '\0'; - if (parsenum(argv[i], &id)) - se = getservbyport(htons(id), proto); - else - se = getservbyname(argv[i], proto); - if (se == NULL) { - rv = RV_NOTFOUND; - break; - } - servicesprint(se); - } - } - endservent(); - return rv; -} - -static int shells(int argc, char *argv[]) -{ - const char *sh; - int i, rv; - - setusershell(); - rv = RV_OK; - if (argc == 2) { - while ((sh = getusershell()) != NULL) - (void)printf("%s\n", sh); - } else { - for (i = 2; i < argc; i++) { - setusershell(); - while ((sh = getusershell()) != NULL) { - if (strcmp(sh, argv[i]) == 0) { - (void)printf("%s\n", sh); - break; - } - } - if (sh == NULL) { - rv = RV_NOTFOUND; - break; - } - } - } - endusershell(); - return rv; -} - -static struct getentdb { - const char *name; - int (*callback)(int, char *[]); -} databases[] = { - { "ethers", ethers, }, - { "group", group, }, - { "hosts", hosts, }, - { "networks", networks, }, - { "passwd", passwd, }, - { "protocols", protocols, }, - { "services", services, }, - { "shells", shells, }, - - { NULL, NULL, }, -}; - -static int usage(const char *arg0) -{ - struct getentdb *curdb; - size_t i; - - (void)fprintf(stderr, "Usage: %s database [key ...]\n", arg0); - (void)fprintf(stderr, "\tdatabase may be one of:"); - for (i = 0, curdb = databases; curdb->name != NULL; curdb++, i++) { - if (i % 7 == 0) - (void)fputs("\n\t\t", stderr); - (void)fprintf(stderr, "%s%s", i % 7 == 0 ? "" : " ", - curdb->name); - } - (void)fprintf(stderr, "\n"); - exit(RV_USAGE); - /* NOTREACHED */ -} - -int -main(int argc, char *argv[]) -{ - struct getentdb *curdb; - - if (argc < 2) - usage(argv[0]); - for (curdb = databases; curdb->name != NULL; curdb++) - if (strcmp(curdb->name, argv[1]) == 0) - return (*curdb->callback)(argc, argv); - - warn("Unknown database `%s'", argv[1]); - usage(argv[0]); - /* NOTREACHED */ -} diff --git a/repo/devel/gcc/iconv.c b/repo/devel/gcc/iconv.c deleted file mode 100644 index f5d5ce2..0000000 --- a/repo/devel/gcc/iconv.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * iconv.c - * Implementation of SUSv4 XCU iconv utility - * Copyright © 2011 Rich Felker - * Licensed under the terms of the GNU General Public License, v2 or later - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - const char *from=0, *to=0; - int b; - iconv_t cd; - char buf[BUFSIZ]; - char outbuf[BUFSIZ*4]; - char *in, *out; - size_t inb; - size_t l; - size_t unitsize=0; - int err=0; - FILE *f; - - while ((b = getopt(argc, argv, "f:t:csl")) != EOF) switch(b) { - case 'l': - puts("UTF-8, UTF-16BE, UTF-16LE, UTF-32BE, UTF32-LE, UCS-2BE, UCS-2LE, WCHAR_T,\n" - "US_ASCII, ISO8859-1, ISO8859-2, ISO8859-3, ISO8859-4, ISO8859-5,\n" - "ISO8859-6, ISO8859-7, ..."); - exit(0); - case 'c': case 's': break; - case 'f': from=optarg; break; - case 't': to=optarg; break; - default: exit(1); - } - - if (!from || !to) { - setlocale(LC_CTYPE, ""); - if (!to) to = nl_langinfo(CODESET); - if (!from) from = nl_langinfo(CODESET); - } - cd = iconv_open(to, from); - if (cd == (iconv_t)-1) { - if (iconv_open(to, "WCHAR_T") == (iconv_t)-1) - fprintf(stderr, "iconv: destination charset %s: ", to); - else - fprintf(stderr, "iconv: source charset %s: ", from); - perror(""); - exit(1); - } - if (optind == argc) argv[argc++] = "-"; - - for (; optind < argc; optind++) { - if (argv[optind][0]=='-' && !argv[optind][1]) { - f = stdin; - argv[optind] = "(stdin)"; - } else if (!(f = fopen(argv[optind], "rb"))) { - fprintf(stderr, "iconv: %s: ", argv[optind]); - perror(""); - err = 1; - continue; - } - inb = 0; - for (;;) { - in = buf; - out = outbuf; - l = fread(buf+inb, 1, sizeof(buf)-inb, f); - inb += l; - if (!inb) break; - if (iconv(cd, &in, &inb, &out, (size_t [1]){sizeof outbuf})==-1 - && errno == EILSEQ) { - if (!unitsize) { - wchar_t wc='0'; - char dummy[4], *dummyp=dummy; - iconv_t cd2 = iconv_open(from, "WCHAR_T"); - if (cd == (iconv_t)-1) { - unitsize = 1; - } else { - iconv(cd2, - (char *[1]){(char *)&wc}, - (size_t[1]){1}, - &dummyp, (size_t[1]){4}); - unitsize = dummyp-dummy; - if (!unitsize) unitsize=1; - } - } - inb-=unitsize; - in+=unitsize; - } - if (inb && !l && errno==EINVAL) break; - if (out>outbuf && !fwrite(outbuf, out-outbuf, 1, stdout)) { - perror("iconv: write error"); - exit(1); - } - if (inb) memmove(buf, in, inb); - } - if (ferror(f)) { - fprintf(stderr, "iconv: %s: ", argv[optind]); - perror(""); - err = 1; - } - } - return err; -} diff --git a/repo/devel/gcc/libgcc.xibuild b/repo/devel/gcc/libgcc.xibuild deleted file mode 100644 index d9f28bf..0000000 --- a/repo/devel/gcc/libgcc.xibuild +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -DEPS="musl" -DESC="GNU C compiler runtime libraries" - -package () { - add_from_main "usr/lib/libgcc_s.so*" -} diff --git a/repo/devel/gcc/libstdc++.xibuild b/repo/devel/gcc/libstdc++.xibuild deleted file mode 100644 index 3115e0c..0000000 --- a/repo/devel/gcc/libstdc++.xibuild +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -DEPS="musl" -DESC="GNU C++ standard library" - -package () { - add_from_main "usr/lib/libstdc++.so*" -} diff --git a/repo/devel/gdb/gdb.xibuild b/repo/devel/gdb/gdb.xibuild deleted file mode 100644 index 86dec8f..0000000 --- a/repo/devel/gdb/gdb.xibuild +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make expat guile ncurses python xz texinfo" -DEPS="python-six doxygen gcc guile rust python " - -PKG_VER=11.2 -SOURCE=https://ftp.gnu.org/gnu/gdb/gdb-$PKG_VER.tar.xz -DESC="The GNU debugger" - -build () { - mkdir build && - cd build && - - ../configure --prefix=/usr \ - --with-system-readline \ - --with-python=/usr/bin/python3 && - make - -} - -#check () { -# cd gdb/testsuite && -# make site.exp && -# echo "set gdb_test_timeout 120" >> site.exp && -# runtest -# cd ../.. -# -#} - -package () { - make -C gdb DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/git/git.xibuild b/repo/devel/git/git.xibuild deleted file mode 100644 index ab8e273..0000000 --- a/repo/devel/git/git.xibuild +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -MAKEDEPS="grep python make xmlto cmake" -DEPS="curl perl openssl pcre2 grep shadow zlib openssh" - -PKG_VER=2.34.1 -SOURCE=https://www.kernel.org/pub/software/scm/git/git-$PKG_VER.tar.xz -DESC="The free and open source, distributed version control system" - -build () { - ./configure --prefix=/usr \ - --with-gitconfig=/etc/gitconfig \ - --with-python=python3 && - make -} - -package () { - make perllibdir=/usr/lib/perl5/5.34/site_perl DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/go/go.xibuild b/repo/devel/go/go.xibuild deleted file mode 100644 index 9a5f1b7..0000000 --- a/repo/devel/go/go.xibuild +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -# Ensure we have gcc-go -MAKEDEPS="make gcc" -DEPS="" - -PKG_VER=1.17.7 -SOURCE=https://go.dev/dl/go$PKG_VER.src.tar.gz - -BOOTSTRAP="go1.4-bootstrap-20171003" -ADDITIONAL=" - https://dl.google.com/go/$BOOTSTRAP.tar.gz -" - -DESC="Core compiler tools for the Go programming language" - -prepare () { - export TMPDIR=/tmp - tar -xvf $BOOTSTRAP.tar.gz - mv go $BOOTSTRAP -} - -build () { - export sourceroot=$(pwd) - export GOARCH=amd64 - export GOAMD64=v1 # make sure we're building for the right x86-64 version - export GOOS="linux" - - cd $BOOTSTRAP - cd src - echo "~~~~BUILDING BOOTSTRAP" - CGO_ENABLED=0 ./make.bash -v - - cd $sourceroot - export GOROOT_FINAL=/usr/lib/go - export GOROOT_BOOTSTRAP="$(pwd)/$BOOTSTRAP" - - echo "~~~~BUILDING GOLANG" - cd src - if [ ! -z "${GOROOT_BOOTSTRAP}" ]; then - ./bootstrap.bash -v - fi - ./make.bash -v - cd .. -} - -package () { - install -d "$PKG_DEST/usr/bin" "$PKG_DEST/usr/lib/go" "$PKG_DEST/usr/share/doc/go" \ - "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"dynlink \ - "$PKG_DEST/usr/lib/go/pkg/linux_amd64_"race - - cp -a bin pkg src lib misc api test "$PKG_DEST/usr/lib/go" - cp -r doc/* "$PKG_DEST/usr/share/doc/go" - - ln -sf /usr/lib/go/bin/go "$PKG_DEST/usr/bin/go" - ln -sf /usr/lib/go/bin/gofmt "$PKG_DEST/usr/bin/gofmt" - ln -sf /usr/share/doc/go "$PKG_DEST/usr/lib/go/doc" - - install -Dm644 VERSION "$PKG_DEST/usr/lib/go/VERSION" - - rm -rf "$PKG_DEST/usr/lib/go/pkg/bootstrap" "$PKG_DEST/usr/lib/go/pkg/tool/*/api" - - # TODO: Figure out if really needed - rm -rf "$PKG_DEST"/usr/lib/go/pkg/obj/go-build/* - - install -Dm644 LICENSE "$PKG_DEST/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/repo/devel/gtk-doc/gtk-doc.xibuild b/repo/devel/gtk-doc/gtk-doc.xibuild deleted file mode 100644 index 074eca0..0000000 --- a/repo/devel/gtk-doc/gtk-doc.xibuild +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="docbook4-xml docbook-dtd docbook-xsl itstool libxslt" - -PKG_VER=1.33.2 -SOURCE=https://download.gnome.org/sources/gtk-doc/${PKG_VER%.*}/gtk-doc-$PKG_VER.tar.xz -DESC="Documentation tool for public library API" - -prepare () { - autoreconf -fiv -} -build () { - ./configure --prefix=/usr && - make -} - -package () { - make DESTDIR=$PKG_DEST install -} - - diff --git a/repo/devel/help2man/help2man.xibuild b/repo/devel/help2man/help2man.xibuild deleted file mode 100644 index 1386c01..0000000 --- a/repo/devel/help2man/help2man.xibuild +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make perl" -DEPS="sh" - -PKG_VER=1.48.5 -SOURCE=http://mirror.koddos.net/gnu/help2man/help2man-$PKG_VER.tar.xz -DESC="A tool for automatically generating simple manual pages from program output" - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install -} - diff --git a/repo/devel/icecream/icecream.xibuild b/repo/devel/icecream/icecream.xibuild deleted file mode 100644 index 713f16e..0000000 --- a/repo/devel/icecream/icecream.xibuild +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python make " -DEPS="gcc python libcap-ng lzo libarchive" - -SOURCE=https://github.com/icecc/icecream/releases/download/1.3.1/icecc-1.3.1.tar.xz - -DESC="A build distribution service based on distcc" - - -build () { - ./configure --prefix=/usr - make -} - - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/imake/imake.xibuild b/repo/devel/imake/imake.xibuild deleted file mode 100644 index 2828071..0000000 --- a/repo/devel/imake/imake.xibuild +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -NAME="imake" -DESC="X Windows make utility" - -MAKEDEPS="make " -DEPS="musl " - -PKG_VER=1.0.8 -SOURCE="https://ftp.x.org/pub/individual/util/imake-$PKG_VER.tar.bz2" - -build () { - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sysconfdir=/etc \ - --disable-static - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/itstool/itstool.xibuild b/repo/devel/itstool/itstool.xibuild deleted file mode 100644 index 721c5a7..0000000 --- a/repo/devel/itstool/itstool.xibuild +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="docbook-xml" - -PKG_VER=2.0.7 -SOURCE=http://files.itstool.org/itstool/itstool-2.0.7.tar.bz2 -DESC="Extract messages from XML files and output PO template files" - -build () { - PYTHON=/usr/bin/python3 ./configure --prefix=/usr && - make -} - -package () { - make DESTDIR=$PKG_DEST install -} - - diff --git a/repo/devel/libexecinfo/10-execinfo.patch b/repo/devel/libexecinfo/10-execinfo.patch deleted file mode 100644 index 44db530..0000000 --- a/repo/devel/libexecinfo/10-execinfo.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/execinfo.c.orig -+++ b/execinfo.c -@@ -69,7 +69,8 @@ - char ** - backtrace_symbols(void *const *buffer, int size) - { -- int i, clen, alen, offset; -+ size_t clen, alen; -+ int i, offset; - char **rval; - char *cp; - Dl_info info; -@@ -78,7 +79,6 @@ - rval = malloc(clen); - if (rval == NULL) - return NULL; -- (char **)cp = &(rval[size]); - for (i = 0; i < size; i++) { - if (dladdr(buffer[i], &info) != 0) { - if (info.dli_sname == NULL) -@@ -92,14 +92,14 @@ - 2 + /* " <" */ - strlen(info.dli_sname) + /* "function" */ - 1 + /* "+" */ -- D10(offset) + /* "offset */ -+ 10 + /* "offset */ - 5 + /* "> at " */ - strlen(info.dli_fname) + /* "filename" */ - 1; /* "\0" */ - rval = realloc_safe(rval, clen + alen); - if (rval == NULL) - return NULL; -- snprintf(cp, alen, "%p <%s+%d> at %s", -+ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s", - buffer[i], info.dli_sname, offset, info.dli_fname); - } else { - alen = 2 + /* "0x" */ -@@ -108,12 +108,15 @@ - rval = realloc_safe(rval, clen + alen); - if (rval == NULL) - return NULL; -- snprintf(cp, alen, "%p", buffer[i]); -+ snprintf((char *) rval + clen, alen, "%p", buffer[i]); - } -- rval[i] = cp; -- cp += alen; -+ rval[i] = (char *) clen; -+ clen += alen; - } - -+ for (i = 0; i < size; i++) -+ rval[i] += (long) rval; -+ - return rval; - } - -@@ -155,6 +158,6 @@ - return; - snprintf(buf, len, "%p\n", buffer[i]); - } -- write(fd, buf, len - 1); -+ write(fd, buf, strlen(buf)); - } - } diff --git a/repo/devel/libexecinfo/20-define-gnu-source.patch b/repo/devel/libexecinfo/20-define-gnu-source.patch deleted file mode 100644 index 7255ecd..0000000 --- a/repo/devel/libexecinfo/20-define-gnu-source.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/execinfo.c.orig -+++ b/execinfo.c -@@ -26,6 +26,7 @@ - * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $ - */ - -+#define _GNU_SOURCE - #include - #include - #include ---- a/stacktraverse.c.orig -+++ b/stacktraverse.c -@@ -1,3 +1,4 @@ -+#define _GNU_SOURCE - #include - - #include "stacktraverse.h" ---- a/test.c.orig -+++ b/test.c -@@ -1,3 +1,4 @@ -+#define _GNU_SOURCE - #include - #include - diff --git a/repo/devel/libexecinfo/30-linux-makefile.patch b/repo/devel/libexecinfo/30-linux-makefile.patch deleted file mode 100644 index 6bc8a89..0000000 --- a/repo/devel/libexecinfo/30-linux-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/Makefile.orig -+++ b/Makefile -@@ -23,24 +23,25 @@ - # SUCH DAMAGE. - # - # $Id: Makefile,v 1.3 2004/07/19 05:19:55 sobomax Exp $ -+# -+# Linux Makefile by Matt Smith , 2011/01/04 - --LIB= execinfo -+CC=cc -+AR=ar -+EXECINFO_CFLAGS=$(CFLAGS) -O2 -pipe -fno-strict-aliasing -std=gnu99 -fstack-protector -c -+EXECINFO_LDFLAGS=$(LDFLAGS) - --SRCS= stacktraverse.c stacktraverse.h execinfo.c execinfo.h -+all: static dynamic - --INCS= execinfo.h -+static: -+ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -+ $(CC) $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -+ $(AR) rcs libexecinfo.a stacktraverse.o execinfo.o - --SHLIB_MAJOR= 1 --SHLIB_MINOR= 0 -+dynamic: -+ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) stacktraverse.c -o stacktraverse.So -+ $(CC) -fpic -DPIC $(EXECINFO_CFLAGS) $(EXECINFO_LDFLAGS) execinfo.c -o execinfo.So -+ $(CC) -shared -Wl,-soname,libexecinfo.so.1 -o libexecinfo.so.1 stacktraverse.So execinfo.So - --NOPROFILE= yes -- --DPADD= ${LIBM} --LDADD= -lm -- --#WARNS?= 4 -- --#stacktraverse.c: gen.py --# ./gen.py > stacktraverse.c -- --.include -+clean: -+ rm -rf *.o *.So *.a *.so diff --git a/repo/devel/libexecinfo/libexecinfo.xibuild b/repo/devel/libexecinfo/libexecinfo.xibuild deleted file mode 100644 index 67e1002..0000000 --- a/repo/devel/libexecinfo/libexecinfo.xibuild +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -NAME="libexecinfo" -DESC="A quick-n-dirty BSD licensed clone of the GNU libc backtrace facility." - -MAKEDEPS="make " -DEPS="musl " - -PKG_VER=1.1 -SOURCE="http://distcache.freebsd.org/local-distfiles/itetcu/libexecinfo-$PKG_VER.tar.bz2" -ADDITIONAL="30-linux-makefile.patch 20-define-gnu-source.patch 10-execinfo.patch " - -prepare () { - apply_patches -} - -build () { - export CFLAGS="${CFLAGS} -fno-omit-frame-pointer" - make PREFIX=/usr -} - -package () { - install -D -m755 execinfo.h \ - "$PKG_DEST"/usr/include/execinfo.h - install -D -m755 stacktraverse.h \ - "$PKG_DEST"/usr/include/stacktraverse.h - install -D -m755 libexecinfo.so.1 \ - "$PKG_DEST"/usr/lib/libexecinfo.so.1 - ln -s /usr/lib/libexecinfo.so.1 \ - "$PKG_DEST"/usr/lib/libexecinfo.so - -} diff --git a/repo/devel/llvm/clang-001-fix-unwind-chain-inclusion.patch b/repo/devel/llvm/clang-001-fix-unwind-chain-inclusion.patch deleted file mode 100644 index e4eaa77..0000000 --- a/repo/devel/llvm/clang-001-fix-unwind-chain-inclusion.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:14:57 +0200 -Subject: [PATCH 2/7] fix unwind chain inclusion - ---- - lib/Headers/unwind.h | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h -index 303d792..44e10cc 100644 ---- a/clang/lib/Headers/unwind.h -+++ b/clang/lib/Headers/unwind.h -@@ -9,9 +9,6 @@ - - /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ - --#ifndef __CLANG_UNWIND_H --#define __CLANG_UNWIND_H -- - #if defined(__APPLE__) && __has_include_next() - /* Darwin (from 11.x on) provide an unwind.h. If that's available, - * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, -@@ -39,6 +36,9 @@ - # endif - #else - -+#ifndef __CLANG_UNWIND_H -+#define __CLANG_UNWIND_H -+ - #include - - #ifdef __cplusplus -@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); - } - #endif - -+#endif /* __CLANG_UNWIND_H */ -+ - #endif - --#endif /* __CLANG_UNWIND_H */ --- -2.5.1 diff --git a/repo/devel/llvm/clang-002-add-musl-triples.patch b/repo/devel/llvm/clang-002-add-musl-triples.patch deleted file mode 100644 index 25688d4..0000000 --- a/repo/devel/llvm/clang-002-add-musl-triples.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/clang/lib/Driver/ToolChains/Gnu.cpp -+++ b/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -2086,7 +2086,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", - "armv7hl-redhat-linux-gnueabi", - "armv6hl-suse-linux-gnueabi", -- "armv7hl-suse-linux-gnueabi"}; -+ "armv7hl-suse-linux-gnueabi", -+ "armv7l-linux-gnueabihf"}; - static const char *const ARMebLibDirs[] = {"/lib"}; - static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", - "armeb-linux-androideabi"}; -@@ -2153,8 +2154,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - "powerpc64-suse-linux", "powerpc-montavista-linuxspe"}; - static const char *const PPCLELibDirs[] = {"/lib32", "/lib"}; - static const char *const PPCLETriples[] = {"powerpcle-linux-gnu", -- "powerpcle-unknown-linux-gnu", -- "powerpcle-linux-musl"}; -+ "powerpcle-unknown-linux-gnu"}; - - static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; - static const char *const PPC64Triples[] = { -@@ -2235,6 +2235,87 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( - return; - } - -+ if (TargetTriple.isMusl()) { -+ static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"}; -+ static const char *const ARMHFMuslTriples[] = { -+ "arm-linux-musleabihf", "armv7l-linux-musleabihf" -+ }; -+ static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"}; -+ static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"}; -+ static const char *const X86MuslTriples[] = {"i686-linux-musl"}; -+ static const char *const MIPSMuslTriples[] = { -+ "mips-linux-musl", "mipsel-linux-musl", -+ "mipsel-linux-muslhf", "mips-linux-muslhf" -+ }; -+ static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"}; -+ static const char *const PPCLEMuslTriples[] = {"powerpcle-linux-musl"}; -+ static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"}; -+ static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"}; -+ -+ switch (TargetTriple.getArch()) { -+ case llvm::Triple::aarch64: -+ LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs)); -+ TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples)); -+ BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs)); -+ BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples)); -+ break; -+ case llvm::Triple::arm: -+ LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs)); -+ if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) { -+ TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples)); -+ } else { -+ TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples)); -+ } -+ break; -+ case llvm::Triple::x86_64: -+ LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); -+ TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples)); -+ BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs)); -+ BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples)); -+ break; -+ case llvm::Triple::x86: -+ LibDirs.append(begin(X86LibDirs), end(X86LibDirs)); -+ TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples)); -+ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); -+ BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples)); -+ break; -+ case llvm::Triple::mips: -+ LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs)); -+ TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples)); -+ break; -+ case llvm::Triple::ppc: -+ LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs)); -+ TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples)); -+ BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs)); -+ BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples)); -+ break; -+ case llvm::Triple::ppcle: -+ LibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs)); -+ TripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples)); -+ BiarchLibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs)); -+ BiarchTripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples)); -+ break; -+ case llvm::Triple::ppc64: -+ LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs)); -+ TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples)); -+ BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs)); -+ BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples)); -+ break; -+ case llvm::Triple::ppc64le: -+ LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs)); -+ TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples)); -+ BiarchLibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs)); -+ BiarchTripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples)); -+ break; -+ default: -+ break; -+ } -+ TripleAliases.push_back(TargetTriple.str()); -+ if (TargetTriple.str() != BiarchTriple.str()) -+ BiarchTripleAliases.push_back(BiarchTriple.str()); -+ return; -+ } -+ - // Android targets should not use GNU/Linux tools or libraries. - if (TargetTriple.isAndroid()) { - static const char *const AArch64AndroidTriples[] = { diff --git a/repo/devel/llvm/clang-tools-extra.xibuild b/repo/devel/llvm/clang-tools-extra.xibuild deleted file mode 100644 index 0058ac9..0000000 --- a/repo/devel/llvm/clang-tools-extra.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -DESC="$DESC - Extra Clang Tools" - -package () { - add_from_main usr/include/clang-tidy - add_from_main usr/bin/clang-apply-replacements - add_from_main usr/bin/clang-query - add_from_main usr/bin/clang-rename - add_from_main usr/bin/clang-tidy - add_from_main usr/bin/diagtool - add_from_main usr/bin/find-all-symbols - add_from_main usr/bin/hmaptool - add_from_main usr/bin/modularize - add_from_main usr/bin/pp-trace - add_from_main usr/bin/sancov - add_from_main "usr/lib/libclangApplyReplacements*" - add_from_main "usr/lib/libclangQuery*" - add_from_main "usr/lib/libclangTidy*" - add_from_main "usr/share/clang/*tidy*" - add_from_main usr/share/doc/clang-tools - add_from_main usr/share/man/man1/extraclangtools.1 - add_from_main usr/share/man/man1/diagtool.1 -} diff --git a/repo/devel/llvm/clang.xibuild b/repo/devel/llvm/clang.xibuild deleted file mode 100644 index 4a3f4f4..0000000 --- a/repo/devel/llvm/clang.xibuild +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -DESC="$DESC - C language frontend" -DEPS="libclang" - -package () { - add_from_main usr/include/clang - add_from_main usr/include/clang-c - add_from_main "usr/bin/*clang*" - add_from_main usr/bin/c-index-test - add_from_main usr/lib/clang - add_from_main usr/lib/cmake/clang - add_from_main "usr/lib/libclang*.a" - add_from_main "usr/lib/libclang*.so" - add_from_main usr/share/clang - add_from_main usr/share/doc/clang - add_from_main usr/share/man/man1/clang.1 -} diff --git a/repo/devel/llvm/libclang.xibuild b/repo/devel/llvm/libclang.xibuild deleted file mode 100644 index 1acdb84..0000000 --- a/repo/devel/llvm/libclang.xibuild +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -DESC="$DESC - C frontend runtime library" - -package () { - add_from_main "usr/lib/libclang.so.*" - add_from_main "usr/lib/libclang-cpp.so.*" -} diff --git a/repo/devel/llvm/libcxx-musl.patch b/repo/devel/llvm/libcxx-musl.patch deleted file mode 100644 index bbd31ff..0000000 --- a/repo/devel/llvm/libcxx-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libcxx/include/locale -+++ b/libcxx/include/locale -@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end, - typename remove_reference::type __save_errno = errno; - errno = 0; - char *__p2; -+#if defined(__linux__) && !defined(__GLIBC__) -+ long long __ll = strtoll(__a, &__p2, __base); -+#else - long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); -+#endif - typename remove_reference::type __current_errno = errno; - if (__current_errno == 0) - errno = __save_errno; -@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end, - typename remove_reference::type __save_errno = errno; - errno = 0; - char *__p2; -+#if defined(__linux__) && !defined(__GLIBC__) -+ unsigned long long __ll = strtoull(__a, &__p2, __base); -+#else - unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); -+#endif - typename remove_reference::type __current_errno = errno; - if (__current_errno == 0) - errno = __save_errno; diff --git a/repo/devel/llvm/libcxx-ssp-nonshared.patch b/repo/devel/llvm/libcxx-ssp-nonshared.patch deleted file mode 100644 index 70292be..0000000 --- a/repo/devel/llvm/libcxx-ssp-nonshared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libcxx/CMakeLists.txt -+++ b/libcxx/CMakeLists.txt -@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target) - target_link_libraries(${target} PRIVATE atomic) - endif() - -+#ssp target_link_libraries(${target} PRIVATE ssp_nonshared) -+ - if (MINGW) - target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}") - endif() diff --git a/repo/devel/llvm/libcxx.xibuild b/repo/devel/llvm/libcxx.xibuild deleted file mode 100644 index 9e84e7f..0000000 --- a/repo/devel/llvm/libcxx.xibuild +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -DESC="C++ standard library from LLVM" - -package () { - add_from_main usr/lib/libc++.so.* - add_from_main usr/lib/libc++.a - add_from_main usr/lib/libc++experimental.a - add_from_main usr/include/c++ - add_from_main usr/share/doc/libcxx - -} diff --git a/repo/devel/llvm/libcxxabi-dl.patch b/repo/devel/llvm/libcxxabi-dl.patch deleted file mode 100644 index 3a15f9d..0000000 --- a/repo/devel/llvm/libcxxabi-dl.patch +++ /dev/null @@ -1,25 +0,0 @@ -Also link to -ldl to prevent undefined references. - ---- a/libcxxabi/src/CMakeLists.txt -+++ b/libcxxabi/src/CMakeLists.txt -@@ -73,6 +73,7 @@ - endif() - - add_library_flags_if(LIBCXXABI_HAS_C_LIB c) -+ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl) - endif() - - if (LIBCXXABI_USE_LLVM_UNWINDER) ---- a/libcxx/CMakeLists.txt -+++ b/libcxx/CMakeLists.txt -@@ -745,6 +745,10 @@ - target_link_libraries(${target} PRIVATE m) - endif() - -+ if (LIBCXX_HAS_C_LIB) -+ target_link_libraries(${target} PRIVATE dl) -+ endif() -+ - if (LIBCXX_HAS_RT_LIB) - target_link_libraries(${target} PRIVATE rt) - endif() diff --git a/repo/devel/llvm/libcxxabi.xibuild b/repo/devel/llvm/libcxxabi.xibuild deleted file mode 100644 index 71f36ba..0000000 --- a/repo/devel/llvm/libcxxabi.xibuild +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -DESC="Low level support for libc++" - -package () { - add_from_main "usr/lib/libc++abi.so.*" \ - usr/lib/libc++abi.so \ - usr/lib/libc++abi.a \ - "usr/include/*cxxabi*" -} diff --git a/repo/devel/llvm/libunwind.xibuild b/repo/devel/llvm/libunwind.xibuild deleted file mode 100644 index b4e8b42..0000000 --- a/repo/devel/llvm/libunwind.xibuild +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -DESC="C++ standard library from LLVM" - -package () { - add_from_main "usr/lib/libunwind.so.*" \ - usr/lib/libunwind.so \ - usr/lib/libunwind.a - - add_from_main "usr/include/*unwind*" - add_from_main usr/include/mach-o - add_from_main usr/share/doc/libunwind - -} diff --git a/repo/devel/llvm/lld.xibuild b/repo/devel/llvm/lld.xibuild deleted file mode 100644 index ff5dc5a..0000000 --- a/repo/devel/llvm/lld.xibuild +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -DESC="LLVM linker" - -package () { - add_from_main usr/bin/lld* - add_from_main usr/bin/wasm-ld - add_from_main usr/bin/ld.lld* - add_from_main usr/bin/ld64.lld* - add_from_main usr/share/doc/lld - - add_from_main usr/include/lld - add_from_main usr/lib/cmake/lld - add_from_main "usr/lib/liblld*a" -} diff --git a/repo/devel/llvm/lldb-musl.patch b/repo/devel/llvm/lldb-musl.patch deleted file mode 100644 index 601c0d1..0000000 --- a/repo/devel/llvm/lldb-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/lldb/source/Plugins/Process/Linux/Procfs.h -+++ b/lldb/source/Plugins/Process/Linux/Procfs.h -@@ -10,21 +10,12 @@ - // sys/procfs.h on Android/Linux for all supported architectures. - - #include -+#include - --#ifdef __ANDROID__ --#if defined(__arm64__) || defined(__aarch64__) --typedef unsigned long elf_greg_t; --typedef elf_greg_t -- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; --typedef struct user_fpsimd_state elf_fpregset_t; --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#elif defined(__mips__) --#ifndef NT_FPREGSET --#define NT_FPREGSET NT_PRFPREG --#endif // NT_FPREGSET --#endif --#else // __ANDROID__ -+#if !defined(__GLIBC__) && defined(__powerpc__) -+#define pt_regs musl_pt_regs -+#include -+#undef pt_regs -+#else - #include --#endif // __ANDROID__ -+#endif diff --git a/repo/devel/llvm/llvm-001-musl.patch b/repo/devel/llvm/llvm-001-musl.patch deleted file mode 100644 index f2a3f8d..0000000 --- a/repo/devel/llvm/llvm-001-musl.patch +++ /dev/null @@ -1,57 +0,0 @@ -From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 -From: Andrea Brancaleoni -Date: Tue, 8 Sep 2015 22:03:02 +0200 -Subject: [PATCH 3/3] musl - ---- - include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ - lib/Support/DynamicLibrary.cpp | 2 +- - lib/Support/Unix/Signals.inc | 6 +++--- - utils/unittest/googletest/src/gtest.cc | 1 + - 5 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h -index 34a8a1e3..1214ece5 100644 ---- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h -+++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h -@@ -18,6 +18,15 @@ - #include "llvm/IR/PassManager.h" - #include "llvm/Pass.h" - -+#undef fopen64 -+#undef fseeko64 -+#undef fstat64 -+#undef fstatvfs64 -+#undef ftello64 -+#undef lstat64 -+#undef stat64 -+#undef tmpfile64 -+ - namespace llvm { - template class ArrayRef; - class Triple; -diff --git a/lib/Support/Unix/DynamicLibrary.inc b/lib/Support/Unix/DynamicLibrary.inc -index a2a37996..2f86c470 100644 ---- a/llvm/lib/Support/Unix/DynamicLibrary.inc -+++ b/llvm/lib/Support/Unix/DynamicLibrary.inc -@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) { - - // This macro returns the address of a well-known, explicit symbol - #define EXPLICIT_SYMBOL(SYM) \ -- if (!strcmp(SymbolName, #SYM)) return &SYM -+ if (!strcmp(SymbolName, #SYM)) return (void *)&SYM - - // Under glibc we have a weird situation. The stderr/out/in symbols are both - // macros and global variables because of standards requirements. So, we -diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc -index d882ab2e..f1fb12d0 100644 ---- a/llvm/utils/unittest/googletest/src/gtest.cc -+++ b/llvm/utils/unittest/googletest/src/gtest.cc -@@ -128,6 +128,7 @@ - - #if GTEST_CAN_STREAM_RESULTS_ - # include // NOLINT -+# include // NOLINT - # include // NOLINT - # include // NOLINT - # include // NOLINT diff --git a/repo/devel/llvm/llvm-004-override-opt.patch b/repo/devel/llvm/llvm-004-override-opt.patch deleted file mode 100644 index 51d0e4b..0000000 --- a/repo/devel/llvm/llvm-004-override-opt.patch +++ /dev/null @@ -1,18 +0,0 @@ -This allows us to override the optimization level as not all platforms can -deal with -O3. - ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -918,6 +918,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") - endif() - -+set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use") -+ -+if (NOT VOID_CXX_OPT_FLAGS STREQUAL "") -+ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}") -+endif() -+ - # Put this before tblgen. Else we have a circular dependence. - add_subdirectory(lib/Demangle) - add_subdirectory(lib/Support) diff --git a/repo/devel/llvm/llvm.xibuild b/repo/devel/llvm/llvm.xibuild deleted file mode 100644 index 9d42a9c..0000000 --- a/repo/devel/llvm/llvm.xibuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-sphinx binutils lua python-six" -DEPS="perl zlib libffi libedit ncurses" - -PKG_VER=13.0.1 -SOURCE="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/llvm-project-$PKG_VER.src.tar.xz" -DESC="Low Level Virtual Machine" - -ADDITIONAL=" -clang-001-fix-unwind-chain-inclusion.patch -clang-002-add-musl-triples.patch -libcxx-musl.patch -libcxx-ssp-nonshared.patch -libcxxabi-dl.patch -llvm-001-musl.patch -llvm-004-override-opt.patch" - -prepare () { - enabled_projects="clang;clang-tools-extra;libcxx;libcxxabi;libunwind;openmp;lld" - - apply_patches - cd llvm - #sed -i 's|__ptrace_request|int|g' \ - #../lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp - - # disable lldb docs, since they fail to generate - #sed -i '/add_subdirectory(docs)/d' \ - #../lldb/CMakeLists.txt - - - sed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \ - ../libcxxabi/cmake/config-ix.cmake - sed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \ - ../libcxxabi/cmake/config-ix.cmake - - - sed -i 's,# Set common link flags.,list(APPEND SANITIZER_COMMON_LINK_LIBS execinfo),' \ - ../compiler-rt/CMakeLists.txt - - export CFLAGS="$CFLAGS -g1" - export CXXFLAGS="$CXXFLAGS -g1" -} - -build () { - mkdir build - cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_LINKER_BUILD_ID=YES \ - -DLLDB_USE_SYSTEM_SIX=YES \ - -DLIBCXX_CXX_ABI=libcxxabi \ - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES \ - -DLIBCXXABI_USE_LLVM_UNWINDER=YES \ - -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES \ - -DLIBOMP_ENABLE_SHARED=YES \ - -DLIBOMP_INSTALL_ALIASES=NO \ - -DLLVM_INCLUDE_DOCS=YES \ - -DLLVM_INSTALL_UTILS=YES \ - -DLLVM_BUILD_LLVM_DYLIB=YES \ - -DLLVM_LINK_LLVM_DYLIB=YES \ - -DLLVM_ENABLE_RTTI=YES \ - -DLLVM_ENABLE_FFI=YES \ - -DLLVM_BINUTILS_INCDIR=/usr/include \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_BUILD_DOCS=OFF \ - -DLIBCXX_HAS_MUSL_LIBC=YES \ - -DLLVM_BUILD_EXAMPLES=OFF \ - -DLLVM_BUILD_TESTS=ON \ - -DLLVM_DEFAULT_TARGET_TRIPLE="x86_64-linux-musl" \ - -DLLVM_ENABLE_ASSERTIONS=OFF \ - -DLLVM_ENABLE_PIC=ON \ - -DLLVM_ENABLE_SPHINX=OFF \ - -DLLVM_ENABLE_TERMINFO=ON \ - -DLLVM_ENABLE_ZLIB=ON \ - -DLLVM_HOST_TRIPLE="x86_64-linux-musl" \ - -DLLVM_INCLUDE_EXAMPLES=OFF \ - -DLLVM_APPEND_VC_REV=OFF \ - -DLLVM_ENABLE_PROJECTS="$enabled_projects" \ - -Wno-dev -G Ninja .. && - - ninja llvm-tblgen && - ninja -} - -package () { - DESTDIR=$PKG_DEST ninja install -} diff --git a/repo/devel/m4/m4.xibuild b/repo/devel/m4/m4.xibuild deleted file mode 100644 index e6ccf14..0000000 --- a/repo/devel/m4/m4.xibuild +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make help2man" -DEPS="musl sh" - -PKG_VER=1.4.19 -SOURCE=https://ftp.gnu.org/gnu/m4/m4-$PKG_VER.tar.xz -DESC="The gnu m4 macro processor" - - -build () { - ./configure --prefix=/usr - make -} - -check () { - make check || true -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/make/make.xibuild b/repo/devel/make/make.xibuild deleted file mode 100644 index bb4412f..0000000 --- a/repo/devel/make/make.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="musl" -DEPS="" - -PKG_VER=4.3 -SOURCE=https://ftp.gnu.org/gnu/make/make-$PKG_VER.tar.gz -DESC="GNU make utility" - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/meson/meson.xibuild b/repo/devel/meson/meson.xibuild deleted file mode 100644 index f445bc4..0000000 --- a/repo/devel/meson/meson.xibuild +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python" -DEPS="python ninja" - -PKG_VER=0.59 -SOURCE=https://github.com/mesonbuild/meson -BRANCH=$PKG_VER - -DESC="High productivity build system" - -build () { - python setup.py build -} - -package () { - python setup.py install --root=$PKG_DEST - - install -Dm644 data/shell-completions/bash/meson $PKG_DEST/usr/share/bash-completion/completions/meson - install -Dm644 data/shell-completions/zsh/_meson $PKG_DEST/usr/share/zsh/site-functions/_meson -} diff --git a/repo/devel/mpc/mpc.xibuild b/repo/devel/mpc/mpc.xibuild deleted file mode 100644 index f9c9477..0000000 --- a/repo/devel/mpc/mpc.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="mpfr" - -PKG_VER=1.2.1 -SOURCE=http://www.multiprecision.org/downloads/mpc-$PKG_VER.tar.gz -DESC="Library for the arithmetic of complex numbers with arbitrarily high precision" - -build () { - ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/mpc-$PKG_VER - - make - make html -} - -check () { - make check -} - -package () { - make DESTDIR=$PKG_DEST install - make DESTDIR=$PKG_DEST install-html -} diff --git a/repo/devel/nasm/nasm.xibuild b/repo/devel/nasm/nasm.xibuild deleted file mode 100644 index b8d7fd6..0000000 --- a/repo/devel/nasm/nasm.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="musl" - -PKG_VER=2.15.05 -SOURCE=https://www.nasm.us/pub/nasm/releasebuilds/$PKG_VER/nasm-$PKG_VER.tar.xz -DESC="80x86 assembler designed for portability and modularity" - -build () { - ./configure --prefix=/usr && - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/ninja/ninja.xibuild b/repo/devel/ninja/ninja.xibuild deleted file mode 100644 index 8ae4868..0000000 --- a/repo/devel/ninja/ninja.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python" -DEPS="musl" - -PKG_VER=1.10.2 -SOURCE=https://github.com/ninja-build/ninja/archive/refs/tags/v$PKG_VER.tar.gz -DESC="Small build system with a focus on speed" - -build () { - python configure.py --bootstrap -} - -check () { - ./ninja ninja_test -} - -package () { - mkdir -p $PKG_DEST/usr/bin - mkdir -p $PKG_DEST/usr/share/{bash-completion/completions,zsh/site-functions} - install -m755 ninja $PKG_DEST/usr/bin/ - install -Dm644 misc/bash-completion $PKG_DEST/usr/share/bash-completion/completions/ninja - install -Dm644 misc/zsh-completion $PKG_DEST/usr/share/zsh/site-functions/_ninja -} diff --git a/repo/devel/patch/patch.xibuild b/repo/devel/patch/patch.xibuild deleted file mode 100644 index 015aeeb..0000000 --- a/repo/devel/patch/patch.xibuild +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="musl attr" - -PKG_VER=2.7 -SOURCE=https://ftp.gnu.org/gnu/patch/patch-$PKG_VER.tar.xz -DESC="A utility to apply patch files to a file" - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/pkg-config/pkg-config.xibuild b/repo/devel/pkg-config/pkg-config.xibuild deleted file mode 100644 index 3db8dfd..0000000 --- a/repo/devel/pkg-config/pkg-config.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make" -DEPS="musl" - -PKG_VER=0.29.2 -SOURCE=https://pkg-config.freedesktop.org/releases/pkg-config-$PKG_VER.tar.gz -DESC="Package compiler and linker metadata toolkit" - -build () { - ./configure --prefix=/usr \ - --with-internal-glib \ - --disable-host-tool \ - --docdir=/usr/share/doc/pkg-config-$PKG_VER - make -} - -check () { - make check -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch deleted file mode 100644 index 30cb66f..0000000 --- a/repo/devel/rust/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -Additions for build.rs by q66, necessary for our musl setup. - -From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 9 Sep 2017 00:14:16 -0500 -Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl - ---- - src/libunwind/lib.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs -index 9182e349b19..0377fbb58fc 100644 ---- a/library/unwind/src/lib.rs -+++ b/library/unwind/src/lib.rs -@@ -51,7 +51,7 @@ - #[link(name = "unwind", cfg(not(target_feature = "crt-static")))] - extern "C" {} - } else { -- #[link(name = "unwind", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))] -+ #[link(name = "gcc_eh", cfg(target_feature = "crt-static"))] - #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] - extern "C" {} - } diff --git a/repo/devel/rust/0007-do-not-install-libunwind-source.patch b/repo/devel/rust/0007-do-not-install-libunwind-source.patch deleted file mode 100644 index e8ff8b7..0000000 --- a/repo/devel/rust/0007-do-not-install-libunwind-source.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Dominic Meiser -Date: Tue, 22 Dec 2020 23:31:28 +0100 -Subject: [PATCH] Do not install libunwind source - -This was added in rustc 1.48, but is incompatible with the Alpine Linux package since it removes all bundled -dependencies prior to building. - -diff -Naur rustc-1.48.0-src.orig/src/bootstrap/dist.rs rustc-1.48.0-src/src/bootstrap/dist.rs ---- rustc-1.48.0-src.orig/src/bootstrap/dist.rs 2020-12-22 16:39:30.504249113 +0100 -+++ rustc-1.48.0-src/src/bootstrap/dist.rs 2020-12-22 16:42:08.663006830 +0100 -@@ -1016,7 +1016,7 @@ - copy_src_dirs( - builder, - &builder.src, -- &["library", "src/llvm-project/libunwind"], -+ &["library"], - &[ - // not needed and contains symlinks which rustup currently - // chokes on when unpacking. diff --git a/repo/devel/rust/alpine-move-py-scripts-to-share.patch b/repo/devel/rust/alpine-move-py-scripts-to-share.patch deleted file mode 100644 index 21be36f..0000000 --- a/repo/devel/rust/alpine-move-py-scripts-to-share.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/src/etc/rust-gdb -+++ b/src/etc/rust-gdb -@@ -12,7 +12,7 @@ - - # Find out where the pretty printer Python module is - RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" --GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" -+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc" - - # Run GDB with the additional arguments that load the pretty printers - # Set the environment variable `RUST_GDB` to overwrite the call to a - # Set the environment variable `RUST_GDB` to overwrite the call to a ---- a/src/etc/rust-lldb -+++ b/src/etc/rust-lldb -@@ -8,7 +8,7 @@ - - # Find out where to look for the pretty printer Python module - RUSTC_SYSROOT=$(rustc --print sysroot) --RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" -+RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc" - - lldb=lldb - if [ -f "$RUST_LLDB" ]; then diff --git a/repo/devel/rust/alpine-target.patch b/repo/devel/rust/alpine-target.patch deleted file mode 100644 index 2392cdd..0000000 --- a/repo/devel/rust/alpine-target.patch +++ /dev/null @@ -1,191 +0,0 @@ -From: Shiz -Updated by Rasmus Thomsen on 28th of July 2019 -Updated again by Ariadne Conill on 31 October 2020 -Date: Thu, 20 Aug 2017 01:52:36 +0200 -Last-Updated: Sat, 28 Oct 2017 20:23:00 +0200 -Subject: [PATCH] Add Alpine targets - -This adds `$arch-alpine-linux-musl` targets to Rust to encode our toolchain -and distribution-specific quirks instead of polluting the main musl target of -`$arch-unknown-linux-musl`. - ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/aarch64_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::aarch64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "aarch64-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/armv6_alpine_linux_musleabihf.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::arm_unknown_linux_musleabihf::target(); -+ -+ base.llvm_target = "armv6-alpine-linux-musleabihf".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/armv7_alpine_linux_musleabihf.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::armv7_unknown_linux_musleabihf::target(); -+ -+ base.llvm_target = "armv7-alpine-linux-musleabihf".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/i586_alpine_linux_musl.rs -@@ -0,0 +1,14 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::i686_unknown_linux_musl::target(); -+ -+ base.options.cpu = "pentium4".to_string(); -+ base.llvm_target = "i586-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- rustc-1.48.0-src.orig/compiler/rustc_target/src/spec/mod.rs -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/mod.rs -@@ -490,6 +490,16 @@ - } - - supported_targets! { -+ ("i586-alpine-linux-musl", i586_alpine_linux_musl), -+ ("x86_64-alpine-linux-musl", x86_64_alpine_linux_musl), -+ ("aarch64-alpine-linux-musl", aarch64_alpine_linux_musl), -+ ("armv6-alpine-linux-musleabihf", armv6_alpine_linux_musleabihf), -+ ("armv7-alpine-linux-musleabihf", armv7_alpine_linux_musleabihf), -+ ("powerpc-alpine-linux-musl", powerpc_alpine_linux_musl), -+ ("powerpc64-alpine-linux-musl", powerpc64_alpine_linux_musl), -+ ("powerpc64le-alpine-linux-musl", powerpc64le_alpine_linux_musl), -+ ("s390x-alpine-linux-musl", s390x_alpine_linux_musl), -+ ("riscv64-alpine-linux-musl", riscv64_alpine_linux_musl), - ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu), - ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32), - ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/powerpc64_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc64-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/powerpc64le_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc64le_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc64le-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/powerpc_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/s390x_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::s390x_unknown_linux_musl::target(); -+ -+ base.llvm_target = "s390x-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.48.0-src/compiler/rustc_target/src/spec/x86_64_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::x86_64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "x86_64-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} ---- /dev/null -+++ rustc-1.52.1-src/compiler/rustc_target/src/spec/riscv64_alpine_linux_musl.rs -@@ -0,0 +1,13 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::riscv64gc_unknown_linux_musl::target(); -+ -+ base.llvm_target = "riscv64-alpine-linux-musl".to_string(); -+ base.options.vendor = "alpine".to_string(); -+ base.options.crt_static_default = false; -+ base.options.static_position_independent_executables = true; -+ base.options.need_rpath = true; -+ -+ base -+} diff --git a/repo/devel/rust/cargo.xibuild b/repo/devel/rust/cargo.xibuild deleted file mode 100644 index 8a9f47e..0000000 --- a/repo/devel/rust/cargo.xibuild +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -DEPS="rust" -DESC="Rust package manager" - -package () { - add_from_main "usr/bin/cargo" -} diff --git a/repo/devel/rust/check-rustc b/repo/devel/rust/check-rustc deleted file mode 100644 index d4b85be..0000000 --- a/repo/devel/rust/check-rustc +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -# vim: set ts=4: -set -eu - -RUSTC="$1" -TMPDIR="$(pwd)/.tmp-${0##*/}-$RANDOM" -failed=0 - -unset RUST_BACKTRACE -unset RUSTC_CRT_STATIC - - -_rustc() { - printf '\n$ rustc %s\n' "$*" - "$RUSTC" "$@" -} - -die() { - printf '\033[1;31mERROR:\033[0m %s\n' "$1" >&2 # bold red - exit 1 -} - -fail() { - printf '\033[1;31mFAIL:\033[0m %s\n' "$1" >&2 # bold red - failed=$(( failed + 1 )) -} - -assert_dynamic() { - readelf -l "$1" | grep -Fqw INTERP \ - && readelf -d "$1" | grep -Fqw NEEDED || { - fail "$1 is not a dynamic executable!" - readelf -ld "$1" - } -} - -assert_ok() { - "$1" || fail "$1 exited with status $?" -} - -assert_panic() { - local status=0 - "$1" || status=$? && [ "$status" = 101 ] \ - || fail "$1 exited with status $status, but expected 101" -} - -assert_pie() { - readelf -d "$1" | grep -Fw FLAGS_1 | grep -Fqw PIE || { - fail "$1 is not a PIE executable!" - readelf -d "$1" - } -} - -assert_static() { - test -f "$1" \ - && ! readelf -l "$1" | grep -Fqw INTERP \ - && ! readelf -d "$1" | grep -Fqw NEEDED || { - fail "$1 is not a static executable!" - readelf -ld "$1" - } -} - - -#-------------------- M a i n -------------------- - -test -d "$TMPDIR" && die "$TMPDIR already exists!" -mkdir -p "$TMPDIR" -trap "rm -R '$TMPDIR'" EXIT - -cd "$TMPDIR" - -cat >> hello_world.rs <<-EOF - fn main() { - println!("Hello, world!"); - } -EOF - -_rustc hello_world.rs -assert_ok ./hello_world -assert_dynamic hello_world -assert_pie hello_world -rm -f hello_world - -_rustc -C target-feature=-crt-static hello_world.rs -assert_ok ./hello_world -assert_dynamic hello_world -assert_pie hello_world -rm -f hello_world - -_rustc -C target-feature=+crt-static hello_world.rs -assert_ok ./hello_world -assert_static hello_world -assert_pie hello_world -rm -f hello_world - - -cat >> panic.rs <<-EOF - fn main() { - panic!("This should panic"); - } -EOF - -_rustc -C target-feature=-crt-static panic.rs -assert_panic ./panic - -_rustc -C target-feature=+crt-static panic.rs -assert_panic ./panic - - -[ "$failed" -eq 0 ] || die "$failed assertion(s) has failed" diff --git a/repo/devel/rust/install-template-shebang.patch b/repo/devel/rust/install-template-shebang.patch deleted file mode 100644 index e81b579..0000000 --- a/repo/devel/rust/install-template-shebang.patch +++ /dev/null @@ -1,10 +0,0 @@ -The script seems to be POSIX-sh (+ local) compatible. - ---- a/src/tools/rust-installer/install-template.sh -+++ b/src/tools/rust-installer/install-template.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - # Copyright 2014 The Rust Project Developers. See the COPYRIGHT - # file at the top-level directory of this distribution and at - # http://rust-lang.org/COPYRIGHT. diff --git a/repo/devel/rust/link-musl-dynamically.patch b/repo/devel/rust/link-musl-dynamically.patch deleted file mode 100644 index 55d02a3..0000000 --- a/repo/devel/rust/link-musl-dynamically.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- rustc-1.58.0-src.orig/vendor/libc/src/unix/mod.rs -+++ rustc-1.58.0-src/vendor/libc/src/unix/mod.rs -@@ -329,11 +329,11 @@ - #[link(name = "c", cfg(not(target_feature = "crt-static")))] - extern {} - } else if #[cfg(target_env = "musl")] { -+ #[link(name = "c")] -+ extern {} - #[cfg_attr(feature = "rustc-dep-of-std", -- link(name = "c", kind = "static", modifiers = "-bundle", -+ link(name = "gcc", kind = "static", modifiers = "-bundle", - cfg(target_feature = "crt-static")))] -- #[cfg_attr(feature = "rustc-dep-of-std", -- link(name = "c", cfg(not(target_feature = "crt-static"))))] - extern {} - } else if #[cfg(target_os = "emscripten")] { - #[link(name = "c")] diff --git a/repo/devel/rust/musl-fix-linux_musl_base.patch b/repo/devel/rust/musl-fix-linux_musl_base.patch deleted file mode 100644 index 1771ffe..0000000 --- a/repo/devel/rust/musl-fix-linux_musl_base.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jakub Jirutka -Date: Sat, 08 Aug 2016 15:06:00 +0200 -Subject: [PATCH] Fix linux_musl_base for native musl host - -See https://github.com/rust-lang/rust/pull/40113 - ---- a/compiler/rustc_target/src/spec/linux_musl_base.rs -+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs -@@ -5,12 +5,9 @@ - let mut base = super::linux_base::opts(); - - base.env = "musl".to_string(); -- base.pre_link_objects_fallback = crt_objects::pre_musl_fallback(); -- base.post_link_objects_fallback = crt_objects::post_musl_fallback(); -- base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); - - // These targets statically link libc by default -- base.crt_static_default = true; -+ base.crt_static_default = false; - - base - } - diff --git a/repo/devel/rust/need-rpath.patch b/repo/devel/rust/need-rpath.patch deleted file mode 100644 index 5ab8377..0000000 --- a/repo/devel/rust/need-rpath.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Shiz -Date: Thu, 20 Aug 2017 01:48:22 +0200 -Subject: [PATCH] Add need_rpath target option to force RPATH generation - -This adds a `need_rpath` option to the target options in order to implicitly -have the equivalent of `-C rpath` specified by default for final products -(executables and dynamic libraries), so that RPATHs are always added. - -We have to skip this step in the bootstrap phase as it does its own manual -RPATH additions, but unfortunately there's no clean way to detect this. -As such, we have to resort to checking the `RUSTC_BOOTSTRAP` variable. -Hacky hacky! - ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -379,6 +379,8 @@ - pub allows_weak_linkage: bool, - /// Whether the linker support rpaths or not. Defaults to false. - pub has_rpath: bool, -+ /// Whether to force rpath support on by default. Defaults to false. -+ pub need_rpath: bool, - /// Whether to disable linking to the default libraries, typically corresponds - /// to `-nodefaultlibs`. Defaults to true. - pub no_default_libraries: bool, -@@ -519,6 +519,7 @@ - linker_is_gnu: false, - allows_weak_linkage: true, - has_rpath: false, -+ need_rpath: false, - no_default_libraries: true, - position_independent_executables: false, - static_position_independent_executables: false, -@@ -776,6 +776,7 @@ - key!(linker_is_gnu, bool); - key!(allows_weak_linkage, bool); - key!(has_rpath, bool); -+ key!(need_rpath, bool); - key!(no_default_libraries, bool); - key!(position_independent_executables, bool); - key!(static_position_independent_executables, bool); -@@ -980,6 +980,7 @@ - target_option_val!(linker_is_gnu); - target_option_val!(allows_weak_linkage); - target_option_val!(has_rpath); -+ target_option_val!(need_rpath); - target_option_val!(no_default_libraries); - target_option_val!(position_independent_executables); - target_option_val!(static_position_independent_executables); ---- a/compiler/rustc_codegen_ssa/src/back/link.rs.orig -+++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -1675,7 +1675,10 @@ - // FIXME (#2397): At some point we want to rpath our guesses as to - // where extern libraries might live, based on the - // add_lib_search_paths -- if sess.opts.cg.rpath { -+ // XXX: hacky hacky -+ let bootstrap = env::var("RUSTC_BOOTSTRAP").is_ok(); -+ if !bootstrap && !sess.crt_static(None) && -+ (sess.opts.cg.rpath || sess.target.options.need_rpath) { - let libs = codegen_results - .crate_info - .used_crates diff --git a/repo/devel/rust/need-ssp_nonshared.patch b/repo/devel/rust/need-ssp_nonshared.patch deleted file mode 100644 index f1adf20..0000000 --- a/repo/devel/rust/need-ssp_nonshared.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/library/std/src/sys/unix/mod.rs.orig 2021-02-11 18:34:14.479832268 +0100 -+++ b/library/std/src/sys/unix/mod.rs 2021-02-11 18:38:28.078987749 +0100 -@@ -243,6 +243,9 @@ - #[link(name = "log")] - #[link(name = "gcc")] - extern "C" {} -+ } else if #[cfg(all(target_os = "linux", target_env = "musl"))] { -+ #[link(name = "ssp_nonshared")] -+ extern "C" {} - } else if #[cfg(target_os = "freebsd")] { - #[link(name = "execinfo")] - #[link(name = "pthread")] - diff --git a/repo/devel/rust/rust.xibuild b/repo/devel/rust/rust.xibuild deleted file mode 100644 index a3075e3..0000000 --- a/repo/devel/rust/rust.xibuild +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -MAKEDEPS="cmake libclang clang llvm curl" -DEPS="libssh2 openssl" - -PKG_VER=1.59.0 -SOURCE=https://static.rust-lang.org/dist/rustc-$PKG_VER-src.tar.gz -DESC="Systems programming language focused on safety, speed and concurrency" - -ADDITIONAL=" - 0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch - 0007-do-not-install-libunwind-source.patch - install-template-shebang.patch - link-musl-dynamically.patch - musl-fix-linux_musl_base.patch - need-rpath.patch - need-ssp_nonshared.patch -" - -prepare () { - apply_patches - sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py - sed -i 's/\("files":{\)[^}]*/\1/' vendor/libc/.cargo-checksum.json -} - -build () { - target=x86_64-unknown-linux-musl - build=x86_64-unknown-linux-musl - ./configure \ - --build="$build" \ - --host="$target" \ - --target="$target" \ - --prefix="/usr" \ - --release-channel="stable" \ - --llvm-root="/usr/lib/" \ - --disable-docs \ - --enable-extended \ - --tools="analysis,cargo,src,rustfmt" \ - --enable-llvm-link-shared \ - --enable-option-checking \ - --enable-locked-deps \ - --enable-vendor \ - --set="rust.musl-root=/usr" \ - --set="rust.codegen-units=1" \ - --set="rust.codegen-units-std=1" \ - --set="rust.parallel-compiler=true" \ - --set="target.$target.llvm-config=/usr/bin/llvm-config" \ - --set="target.$target.musl-root=/usr" \ - --set="target.$target.crt-static=false" \ - --set="target.$target.cc=gcc" \ - --set="target.$target.cxx=g++" \ - --set="target.$target.ar=ar" \ - --set="target.$target.linker=gcc" \ - --set="target.$build.musl-root=/usr" \ - --set="target.$build.crt-static=false" \ - --set="target.$build.cc=gcc" \ - --set="target.$build.cxx=g++" \ - --set="target.$build.ar=ar" \ - --set="target.$build.linker=gcc" \ - - sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml - sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs - - python ./x.py dist -v --jobs $JOBS - -} - -package () { - export LIBSSH2_SYS_USE_PKG_CONFIG=1 && - DESTDIR=${PWD}/install python3 ./x.py install && - unset LIBSSH2_SYS_USE_PKG_CONFIG - - chown -R root:root install && - cp -a install/* $PKG_DEST -} diff --git a/repo/devel/scdoc/scdoc.xibuild b/repo/devel/scdoc/scdoc.xibuild deleted file mode 100644 index b2d9f2a..0000000 --- a/repo/devel/scdoc/scdoc.xibuild +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python " -DEPS="pkg-config" - -PKG_VER=1.11.2 -SOURCE=https://git.sr.ht/~sircmpwn/scdoc/archive/$PKG_VER.tar.gz -DESC="Simple man page generator written for POSIX systems written in C99" - -build () { - make PREFIX="/usr" -} - -package () { - make DESTDIR=$PKG_DEST PREFIX="/usr" install -} diff --git a/repo/devel/sgml-common/sgml-common.xibuild b/repo/devel/sgml-common/sgml-common.xibuild deleted file mode 100644 index 0e0ac23..0000000 --- a/repo/devel/sgml-common/sgml-common.xibuild +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -MAKEDEPS="unzip patch" -DEPS="libxml2" - -PKG_VER=0.6.3 -SOURCE=https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-$PKG_VER.tgz -ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/sgml-common-$PKG_VER-manpage-1.patch - " - -DESC="Tools for maintaining centralized SGML catalogs." - -prepare() { - patch -Np1 -i sgml-common-$PKG_VER-manpage-1.patch && - autoreconf -f -i -} - -build() { - ./configure --prefix=/usr --sysconfdir=/etc && - make -} - -package () { - make DESTDIR=$PKG_DEST docdir=/usr/share/doc install && - - mkdir -p $PKG_DEST/etc/sgml - mkdir -p /etc/sgml - -} diff --git a/repo/devel/strace/disable-fortify.patch b/repo/devel/strace/disable-fortify.patch deleted file mode 100644 index 26b2978..0000000 --- a/repo/devel/strace/disable-fortify.patch +++ /dev/null @@ -1,39 +0,0 @@ -Subject: [PATCH] don't use fortify-headers on netlink test sources -From: A. Wilcox - -We can't use fortify-headers on netlink tests because it tests what happens -when a buffer overrun occurs. - ---- strace-4.18/tests/netlink_protocol.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/netlink_protocol.c 2017-08-17 01:09:45.822502012 +0000 -@@ -28,6 +28,8 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _FORTIFY_SOURCE 0 -+ - #include "tests.h" - - #ifdef HAVE_SYS_XATTR_H ---- strace-4.18/tests/netlink_sock_diag.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/netlink_sock_diag.c 2017-08-17 01:10:00.935807300 +0000 -@@ -27,6 +27,8 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _FORTIFY_SOURCE 0 -+ - #include "tests.h" - #include - #include ---- strace-4.18/tests/nlattr.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/nlattr.c 2017-08-17 01:10:11.862453682 +0000 -@@ -28,6 +28,8 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _FORTIFY_SOURCE 0 -+ - #include "tests.h" - - #include diff --git a/repo/devel/strace/nlattr-fix.patch b/repo/devel/strace/nlattr-fix.patch deleted file mode 100644 index 6d480fa..0000000 --- a/repo/devel/strace/nlattr-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- strace-4.18/tests/nlattr.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/nlattr.c 2017-08-17 00:25:26.734218699 +0000 -@@ -61,7 +61,7 @@ - }; - struct msg *msg; - struct nlattr *nla; -- unsigned int msg_len; -+ uint32_t msg_len; - long rc; - - /* fetch fail: len < sizeof(struct nlattr) */ -@@ -259,7 +259,7 @@ - }; - struct msg *msg; - struct nlattr *nla; -- unsigned int msg_len; -+ uint32_t msg_len; - long rc; - - msg_len = NLMSG_SPACE(sizeof(msg->udm)) + sizeof(*nla); - diff --git a/repo/devel/strace/strace.xibuild b/repo/devel/strace/strace.xibuild deleted file mode 100644 index 2c925ba..0000000 --- a/repo/devel/strace/strace.xibuild +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -MAKEDEPS="autoconf automake binutils elfutils gawk linux-headers" -DEPS="libelf musl" - -PKG_VER=5.17 -SOURCE=https://github.com/strace/strace/releases/download/v$PKG_VER/strace-$PKG_VER.tar.xz -ADDITIONAL=" -disable-fortify.patch -nlattr-fix.patch -" - -DESC="Diagnostic, debugging and instructional userspace tracer" - -prepare () { - apply_patches -} - -build () { - export CFLAGS="$CFLAGS -Dsigcontext_struct=sigcontext" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --enable-mpers=no - make - -} - -package () { - make -j1 DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/swig/swig.xibuild b/repo/devel/swig/swig.xibuild deleted file mode 100644 index 5d2471c..0000000 --- a/repo/devel/swig/swig.xibuild +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make autoconf bison" -DEPS="guile gcc musl pcre zlib" - -PKG_VER=4.0.2 -SOURCE=https://downloads.sourceforge.net/swig/swig-$PKG_VER.tar.gz -DESC="A compiler that makes it easy to integrate C and C++ code with scripting languages" - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install - - # backwards compatibility? - ln -s /usr/bin/aclocal $PKG_DEST/usr/bin/aclocal-1.15 -} diff --git a/repo/devel/texinfo/texinfo.xibuild b/repo/devel/texinfo/texinfo.xibuild deleted file mode 100644 index b53afe6..0000000 --- a/repo/devel/texinfo/texinfo.xibuild +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="ncurses gzip perl sh" - -PKG_VER=6.8 -SOURCE=https://ftp.gnu.org/gnu/texinfo/texinfo-$PKG_VER.tar.xz -DESC="GNU documentation system for reading, writing and converting info pages" - -prepare () { - # fix an issue when building with musl-2.34 or later - sed -e 's/__attribute_nonnull__/__nonnull/' \ - -i gnulib/lib/malloc/dynarray-skeleton.c -} - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install - make TEXMF=$PKG_DEST/usr/share/texmf install-tex -} diff --git a/repo/devel/uthash/uthash.xibuild b/repo/devel/uthash/uthash.xibuild deleted file mode 100644 index e9dd494..0000000 --- a/repo/devel/uthash/uthash.xibuild +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -NAME="uthash" -DESC="C macros for hash tables and more" - -MAKEDEPS="make " -DEPS="rxvt-unicode" - -PKG_VER=2.3.0 -SOURCE="https://github.com/troydhanson/uthash/archive/v$PKG_VER.tar.gz" - -package () { - mkdir -p $PKG_DEST/usr/include - install -m 0644 src/*.h $PKG_DEST/usr/include/ -} diff --git a/repo/devel/vala/vala.xibuild b/repo/devel/vala/vala.xibuild deleted file mode 100644 index c9736a3..0000000 --- a/repo/devel/vala/vala.xibuild +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -MAKEDEPS="libxslt bash flex bison gobject-introspection graphviz" -DEPS="glib graphviz musl pkg-config" - -PKG_VER=0.54.7 -SOURCE=https://download.gnome.org/sources/vala/${PKG_VER%.*}/vala-$PKG_VER.tar.xz -DESC="Compiler for the GObject type system" - -prepare () { - sed -i "/constants\/member-access/d" \ - tests/Makefile.in -} - -build () { - ./configure \ - --prefix=/usr - make - -} -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/waf/waf.xibuild b/repo/devel/waf/waf.xibuild deleted file mode 100644 index a479282..0000000 --- a/repo/devel/waf/waf.xibuild +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -NAME="waf" -DESC="The meta build system" - -MAKEDEPS="" -DEPS="python " - -PKG_VER=2.0.22 -SOURCE="https://waf.io/waf-$PKG_VER" - -package () { - install -Dm755 waf-$PKG_VER "$PKG_DEST"/usr/bin/waf -} diff --git a/repo/devel/xmlto/xmlto.xibuild b/repo/devel/xmlto/xmlto.xibuild deleted file mode 100644 index 0efc381..0000000 --- a/repo/devel/xmlto/xmlto.xibuild +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -MAKEDEPS="make " -DEPS="libxslt" - -PKG_VER=0.0.28 -SOURCE=https://releases.pagure.org/xmlto/xmlto-$PKG_VER.tar.bz2 -DESC="Convert xml to many other formats" - - -build () { - ./configure --prefix=/usr - make -} - -package () { - make DESTDIR=$PKG_DEST install -} diff --git a/repo/devel/xorg-cf-files/xorg-cf-files.xibuild b/repo/devel/xorg-cf-files/xorg-cf-files.xibuild deleted file mode 100644 index a99bcdc..0000000 --- a/repo/devel/xorg-cf-files/xorg-cf-files.xibuild +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -NAME="xorg-cf-files" -DESC="Data files for the imake utility" - -MAKEDEPS="make " -DEPS="" - -PKG_VER=1.0.7 -SOURCE="https://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-$PKG_VER.tar.bz2" - -build () { - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sysconfdir=/etc \ - --disable-static - make -} - -package () { - make DESTDIR=$PKG_DEST install -} -- cgit v1.2.1