diff options
| -rw-r--r-- | extra/patches/clang/10-add-musl-triples.patch | 35 | ||||
| -rw-r--r-- | extra/patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch | 81 | ||||
| -rw-r--r-- | repo/devel/clang.xibuild | 54 | ||||
| -rw-r--r-- | repo/devel/llvm.xibuild | 24 | ||||
| -rw-r--r-- | repo/media/flac.xibuild | 8 | ||||
| -rw-r--r-- | repo/media/libvorbis.xibuild | 2 | ||||
| -rw-r--r-- | repo/skip/js78.xibuild | 55 | ||||
| -rw-r--r-- | repo/system/execline.xibuild | 24 | ||||
| -rw-r--r-- | repo/system/js78.xibuild | 64 | ||||
| -rw-r--r-- | repo/system/libtirpc.xibuild | 11 | ||||
| -rw-r--r-- | repo/system/polkit.xibuild | 5 | ||||
| -rw-r--r-- | repo/system/python-mako.xibuild | 22 | ||||
| -rw-r--r-- | repo/system/python-markupsafe.xibuild | 16 | ||||
| -rw-r--r-- | repo/system/python-requests.xibuild | 12 | ||||
| -rw-r--r-- | repo/system/python-six.xibuild | 16 | ||||
| -rw-r--r-- | repo/system/python.xibuild | 37 | ||||
| -rw-r--r-- | repo/system/queue-standalone.xibuild | 15 | ||||
| -rw-r--r-- | repo/system/s6.xibuild | 2 |
18 files changed, 302 insertions, 181 deletions
diff --git a/extra/patches/clang/10-add-musl-triples.patch b/extra/patches/clang/10-add-musl-triples.patch new file mode 100644 index 0000000..b11ca84 --- /dev/null +++ b/extra/patches/clang/10-add-musl-triples.patch @@ -0,0 +1,35 @@ +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -2077,6 +2077,7 @@ + static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; + static const char *const AArch64Triples[] = { + "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", ++ "aarch64-linux-musl", + "aarch64-suse-linux", "aarch64-linux-android"}; + static const char *const AArch64beLibDirs[] = {"/lib"}; + static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", +@@ -2086,6 +2087,8 @@ + static const char *const ARMTriples[] = {"arm-linux-gnueabi", + "arm-linux-androideabi"}; + static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", ++ "arm-linux-musleabihf", ++ "armv7l-linux-musleabihf", + "armv7hl-redhat-linux-gnueabi", + "armv6hl-suse-linux-gnueabi", + "armv7hl-suse-linux-gnueabi"}; +@@ -2105,6 +2108,7 @@ + "x86_64-redhat-linux", "x86_64-suse-linux", + "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", + "x86_64-slackware-linux", "x86_64-unknown-linux", ++ "x86_64-linux-musl", + "x86_64-amazon-linux", "x86_64-linux-android"}; + static const char *const X32Triples[] = {"x86_64-linux-gnux32", + "x86_64-pc-linux-gnux32"}; +@@ -2116,6 +2120,7 @@ + "i686-redhat-linux", "i386-redhat-linux", + "i586-suse-linux", "i686-montavista-linux", + "i686-linux-android", "i686-gnu", ++ "i686-linux-musl", + }; + + static const char *const M68kLibDirs[] = {"/lib"}; diff --git a/extra/patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch b/extra/patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch new file mode 100644 index 0000000..f2895ce --- /dev/null +++ b/extra/patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch @@ -0,0 +1,81 @@ +Based on original patchset from Jakub Jirutka <jakub@jirutka.cz> +Updated by Eric Molitor <eric@molitor.org> +Updated by Natanael Copa <ncopa@alpinelinux.org> +Updated by omni <omni+alpine@hack.org> + +--- a/lib/Driver/ToolChains/Linux.h ++++ b/lib/Driver/ToolChains/Linux.h +@@ -11,6 +11,7 @@ + + #include "Gnu.h" + #include "clang/Driver/ToolChain.h" ++#include "clang/Basic/LangOptions.h" + + namespace clang { + namespace driver { +@@ -38,6 +39,18 @@ + CXXStdlibType GetDefaultCXXStdlibType() const override; + bool isPIEDefault() const override; + bool isNoExecStackDefault() const override; ++ ++ LangOptions::StackProtectorMode ++ GetDefaultStackProtectorLevel(bool KernelOrKext) const override { ++ StringRef VendorName = Linux::getTriple().getVendorName(); ++ if (VendorName.compare("alpine") == 0) ++ return LangOptions::SSPStrong; ++ ++ return LangOptions::SSPOff; ++ } ++ ++ ++ + bool IsMathErrnoDefault() const override; + SanitizerMask getSupportedSanitizers() const override; + void addProfileRTLibs(const llvm::opt::ArgList &Args, +--- a/test/Driver/fsanitize.c ++++ b/test/Driver/fsanitize.c +@@ -667,18 +667,17 @@ + // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP + // NOSP-NOT: "-fsanitize=safe-stack" + +-// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP ++// RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP + // RUN: %clang -target x86_64-linux-gnu -fsanitize=address,safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP-ASAN + // RUN: %clang -target x86_64-linux-gnu -fstack-protector -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP + // RUN: %clang -target x86_64-linux-gnu -fsanitize=safe-stack -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SP +-// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP +-// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP ++// RUN: %clang -target arm-linux-androideabi -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP ++// RUN: %clang -target aarch64-linux-android -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=SP + // RUN: %clang -target i386-contiki-unknown -fsanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NO-SP + // NO-SP-NOT: stack-protector + // NO-SP: "-fsanitize=safe-stack" + // SP-ASAN: error: invalid argument '-fsanitize=safe-stack' not allowed with '-fsanitize=address' + // SP: "-fsanitize=safe-stack" +-// SP: -stack-protector + // NO-SP-NOT: stack-protector + + // RUN: %clang -target powerpc64-unknown-linux-gnu -fsanitize=memory %s -### 2>&1 | FileCheck %s -check-prefix=CHECK-SANM +--- a/test/Driver/stack-protector.c ++++ b/test/Driver/stack-protector.c +@@ -35,6 +35,20 @@ + + // Test default stack protector values for Darwin platforms + ++// RUN: %clang -target x86_64-alpine-linux-musl -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE ++// ALPINE: "-stack-protector" "2" ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_SPS ++// ALPINE_SPS: "-stack-protector" "2" ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_ALL ++// ALPINE_ALL: "-stack-protector" "3" ++// ALPINE_ALL-NOT: "-stack-protector-buffer-size" ++ ++// RUN: %clang -target x86_64-alpine-linux-musl -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=ALPINE_NOSSP ++// ALPINE_NOSSP-NOT: "-stack-protector" ++// ALPINE_NOSSP-NOT: "-stack-protector-buffer-size" ++ + // RUN: %clang -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS + // RUN: %clang -ffreestanding -target armv7k-apple-watchos2.0 -### %s 2>&1 | FileCheck %s -check-prefix=SSP_WATCHOS + // SSP_WATCHOS: "-stack-protector" "1" diff --git a/repo/devel/clang.xibuild b/repo/devel/clang.xibuild new file mode 100644 index 0000000..fa4430f --- /dev/null +++ b/repo/devel/clang.xibuild @@ -0,0 +1,54 @@ +#!/bin/sh + +MAKEDEPS="cmake llvm libxml2 ninja python3" +DEPS="curl gcc libssh2 openssl" + +PKG_VER=13.0.1 +SOURCE=https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKG_VER/clang-$PKG_VER.src.tar.xz +DESC="Systems programming language focused on safety, speed and concurrency" + +ADDITIONAL=" + patches/clang/30-Enable-stack-protector-by-default-for-Alpine-Linux.patch + patches/clang/10-add-musl-triples.patch + " + +prepare () { + apply_patches +} + +build () { + mkdir build + cd build + + python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/') + + + cmake .. -G Ninja -Wno-dev \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS_RELEASE_INIT="$CFLAGS -O2" \ + -DCMAKE_CXX_FLAGS_RELEASE_INIT="$CXXFLAGS" \ + -DCMAKE_EXE_LINKER_FLAGS_RELEASE_INIT="$LDFLAGS -Wl,-z,stack-size=2097152" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_VERBOSE_MAKEFILE=OFF \ + -DCLANG_VENDOR=Alpine \ + -DLLVM_EXTERNAL_LIT=/usr/bin/lit \ + -DCLANG_BUILD_EXAMPLES=OFF \ + -DCLANG_INCLUDE_DOCS=ON \ + -DCLANG_PYTHON_BINDINGS_VERSIONS="$python_version" \ + -DLLVM_BUILD_DOCS=ON \ + -DLLVM_ENABLE_SPHINX=ON \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DCLANG_INCLUDE_TESTS=ON \ + -DCLANG_PLUGIN_SUPPORT=ON \ + -DLIBCLANG_BUILD_STATIC=ON \ + -DLLVM_ENABLE_EH=ON \ + -DLLVM_ENABLE_RTTI=ON + + ninja clang-tblgen + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja -C build install + install -m 644 build/lib/libclang.a $PKG_DEST/usr/lib +} diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild index 134a994..aa18732 100644 --- a/repo/devel/llvm.xibuild +++ b/repo/devel/llvm.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python" +MAKEDEPS="make ninja cmake libedit libffi libxml2 ncurses python-setuptools python-sphinx" DEPS="perl zlib libffi libedit ncurses" PKG_VER=13.0.0 @@ -12,11 +12,11 @@ package () { } build () { - mkdir build && - cd build && - + mkdir build + cd build CC=gcc CXX=g++ \ - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DLLVM_ENABLE_FFI=ON \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_BUILD_LLVM_DYLIB=ON \ @@ -25,11 +25,21 @@ build () { -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \ -DLLVM_BUILD_TESTS=ON \ -DLLVM_INSTALL_UTILS=ON \ + -DLLVM_ENABLE_SPHINX=ON \ + -DLLVM_ENABLE_TERMINFO=ON \ -DLLVM_BINUTILS_INCDIR=/usr/include \ -Wno-dev -G Ninja .. && - ninja + ninja llvm-tblgen && + ninja && + cd .. + + python3 utils/lit/setup.py build } package () { - DESTDIR=$PKG_DEST ninja install + DESTDIR=$PKG_DEST ninja -C build install + + cd build + python3 ../utils/lit/setup.py install --prefix=/usr --root=$PKG_DEST + } diff --git a/repo/media/flac.xibuild b/repo/media/flac.xibuild index dd1ab98..b72f3a5 100644 --- a/repo/media/flac.xibuild +++ b/repo/media/flac.xibuild @@ -8,14 +8,6 @@ DESC="Free Lossless Audio Codec" PKG_VER=1.3.3 SOURCE=https://downloads.xiph.org/releases/flac/flac-$PKG_VER.tar.xz -ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/flac-$PKG_VER-security_fixes-1.patch - " - -prepare () { - patch -Np1 -i flac-$PKG_VER-security_fixes-1.patch -} - build () { ./configure --prefix=/usr \ --disable-thorough-tests \ diff --git a/repo/media/libvorbis.xibuild b/repo/media/libvorbis.xibuild index 32ef80e..5952715 100644 --- a/repo/media/libvorbis.xibuild +++ b/repo/media/libvorbis.xibuild @@ -15,5 +15,5 @@ build () { package () { make DESTDIR=$PKG_DEST install - install -v -m644 doc/Vorbis* $PKG_DEST/usr/share/doc/libvorbis-$PKG_VER + install -m644 doc/Vorbis* $PKG_DEST/usr/share/doc/libvorbis-$PKG_VER } diff --git a/repo/skip/js78.xibuild b/repo/skip/js78.xibuild deleted file mode 100644 index 8ac277c..0000000 --- a/repo/skip/js78.xibuild +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -MAKEDEPS="gcc autoconf2-13 icu rustc zlib which zip llvm patch make" -DEPS="readline nspr bash zlib" - -PKG_VER=78.15.0 -SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz -ADDITIONAL=" - patches/js78/disable-jslint.patch - patches/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch - patches/js78/fix-musl-build.patch - patches/js78/fix-python3.10-compilation.patch - " - -DESC="JavaScript interpreter and libraries - Version 78" - -prepare () { - apply_patches - - mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm - export PATH=/opt/rustc/bin:$PATH - export LD_LIBRARY_PATH=/opt/rustc/lib:$LD_LIBRARY_PATH -} - -build () { - mkdir obj && - cd obj && - - CC=gcc CXX=g++ \ - CFLAGS="-fPIE -fPIC" CXXFLAGS="-fPIE -fPIC" SHELL=/bin/bash PYTHON=/usr/bin/python3 \ - ../js/src/configure --prefix=/usr \ - --disable-jemalloc \ - --disable-optimize \ - --enable-ctypes \ - --enable-readline \ - --enable-shared-js \ - --enable-system-ffi \ - --enable-tests \ - --with-intl-api \ - --with-system-icu \ - --with-system-nspr \ - --enable-hardening \ - --enable-release \ - --with-system-zlib \ - --host=x86_64-linux-musl - - make -j1 - -} - -package () { - make DESTDIR=$PKG_DEST install - [ -f $PKG_DEST/usr/lib/libjs_static.ajs ] && rm $PKG_DEST/usr/lib/libjs_static.ajs - sed -i '/@NSPR_CFLAGS@/d' $PKG_DEST/usr/bin/js78-config -} diff --git a/repo/system/execline.xibuild b/repo/system/execline.xibuild new file mode 100644 index 0000000..61d3e57 --- /dev/null +++ b/repo/system/execline.xibuild @@ -0,0 +1,24 @@ +#!/bin/sh + +MAKEDEPS="make" +DEPS="skalibs" + +PKG_VER=2.8.2.0 +SOURCE=https://skarnet.org/software/execline/execline-$PKG_VER.tar.gz +DESC="A non-interactive shell-like scripting language" + +build () { + ./configure --enable-shared \ + --enable-static \ + --enable-allstatic \ + --enable-static-libc \ + --libdir=/usr/lib \ + --with-dynlib=/usr/lib \ + --enable-pedantic-posix + + make +} + +package () { + make DESTDIR=$PKG_DEST install +} diff --git a/repo/system/js78.xibuild b/repo/system/js78.xibuild new file mode 100644 index 0000000..39eb45c --- /dev/null +++ b/repo/system/js78.xibuild @@ -0,0 +1,64 @@ +#!/bin/sh + +MAKEDEPS="gcc autoconf2-13 icu rustc zlib which zip clang llvm patch make" +DEPS="readline nspr bash zlib" + +PKG_VER=78.15.0 +SOURCE=https://archive.mozilla.org/pub/firefox/releases/${PKG_VER}esr/source/firefox-${PKG_VER}esr.source.tar.xz +ADDITIONAL=" + patches/js78/disable-jslint.patch + patches/js78/fd6847c9416f9eebde636e21d794d25d1be8791d.patch + patches/js78/fix-musl-build.patch + patches/js78/fix-python3.10-compilation.patch + " + +DESC="JavaScript interpreter and libraries - Version 78" + +prepare () { + apply_patches + export LDFLAGS="$LDFLAGS -Wl,-z,stack-size=1048576" + + + autoreconf -fi + + mountpoint -q /dev/shm || mount -t tmpfs devshm /dev/shm + export PATH=/opt/rustc/bin:$PATH + export LD_LIBRARY_PATH=/opt/rustc/lib:$LD_LIBRARY_PATH + export RUST_TARGET="x86_64" +} + +build () { + mkdir build && + cd build && + + SHELL=/bin/bash PYTHON=/usr/bin/python3 \ + ../js/src/configure --prefix=/usr \ + --with-clang-path=/usr/bin/clang \ + --with-intl-api \ + --with-libclang-path=/usr/lib \ + --with-system-icu \ + --with-system-nspr \ + --with-system-zlib \ + --enable-ctypes \ + --enable-hardening \ + --enable-optimize="$CFLAGS -O2" \ + --enable-readline \ + --enable-release \ + --enable-shared-js \ + --enable-system-ffi \ + --enable-tests \ + --disable-debug \ + --disable-debug-symbols \ + --disable-jemalloc \ + --disable-strip + + + make -j1 + +} + +package () { + make DESTDIR=$PKG_DEST install + [ -f $PKG_DEST/usr/lib/libjs_static.ajs ] && rm $PKG_DEST/usr/lib/libjs_static.ajs + sed -i '/@NSPR_CFLAGS@/d' $PKG_DEST/usr/bin/js78-config +} diff --git a/repo/system/libtirpc.xibuild b/repo/system/libtirpc.xibuild index 9a80dbd..ec4f3b9 100644 --- a/repo/system/libtirpc.xibuild +++ b/repo/system/libtirpc.xibuild @@ -1,12 +1,21 @@ #!/bin/sh -MAKEDEPS="make " +MAKEDEPS="make queue-standalone" DEPS="krb5" PKG_VER=1.3.2 SOURCE=https://downloads.sourceforge.net/libtirpc/libtirpc-$PKG_VER.tar.bz2 DESC="Transport Independent RPC library (SunRPC replacement)" +ADDITIONAL=" +https://git.alpinelinux.org/aports/plain/main/libtirpc/soname-suffix.patch +" + +prepare () { + apply_patches + autoreconf -fi +} + build () { ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/repo/system/polkit.xibuild b/repo/system/polkit.xibuild index 3f48cd0..567e316 100644 --- a/repo/system/polkit.xibuild +++ b/repo/system/polkit.xibuild @@ -5,9 +5,6 @@ DEPS="expat glib js78 pam" PKG_VER=0.120 SOURCE=https://www.freedesktop.org/software/polkit/releases/polkit-$PKG_VER.tar.gz -ADDITIONAL=" - https://www.linuxfromscratch.org/patches/blfs/svn/polkit-$PKG_VER-security_fix-1.patch - " DESC="Application development toolkit for controlling system-wide privileges" @@ -16,8 +13,6 @@ prepare () { sed '/policy,/d' -i actions/meson.build \ -i src/examples/meson.build - patch -Np1 -i polkit-$PKG_VER-security_fix-1.patch - } build () { diff --git a/repo/system/python-mako.xibuild b/repo/system/python-mako.xibuild deleted file mode 100644 index be10b64..0000000 --- a/repo/system/python-mako.xibuild +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python " -DEPS="python-markupsafe python-beaker python-setuptools" - -PKG_VER=1.1.6 -SOURCE=https://files.pythonhosted.org/packages/source/M/Mako/Mako-$PKG_VER.tar.gz -DESC="A super-fast templating language that borrows the best ideas from the existing templating languages" - -prepare() { - sed -e '/\[tool:pytest\]/a filterwarnings =\n error\n ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning' \ - -e 's/-W error//' \ - -i setup.cfg -} - -build() { - python setup.py build -} - -package () { - python3 setup.py install --root="$PKG_DEST" --optimize=1 -} diff --git a/repo/system/python-markupsafe.xibuild b/repo/system/python-markupsafe.xibuild deleted file mode 100644 index b8327e6..0000000 --- a/repo/system/python-markupsafe.xibuild +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python" -DEPS="python" - -PKG_VER=2.0.1 -SOURCE=https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-$PKG_VER.tar.gz -DESC="Implements a XML/HTML/XHTML Markup safe string for Python" - -build() { - python setup.py build -} - -package () { - python3 setup.py install --root="$PKG_DEST" --optimize=1 -} diff --git a/repo/system/python-requests.xibuild b/repo/system/python-requests.xibuild deleted file mode 100644 index 50a0d2f..0000000 --- a/repo/system/python-requests.xibuild +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python " -DEPS="python cacerts" - -SOURCE=git://github.com/psf/requests.git -DESC="the requests module for python" - -package () { - mkdir -p $PKG_DEST/usr/lib/python3.10/site-packages/ - pip install -t $PKG_DEST/usr/lib/python3.10/site-packages/ . -} diff --git a/repo/system/python-six.xibuild b/repo/system/python-six.xibuild deleted file mode 100644 index 022f497..0000000 --- a/repo/system/python-six.xibuild +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -MAKEDEPS="python " -DEPS="" - -PKG_VER=1.16.0 -SOURCE=https://github.com/benjaminp/six/archive/refs/tags/$PKG_VER.tar.gz -DESC="A python 2 and 3 compatibility library" - -build() { - python setup.py build -} - -package () { - python3 setup.py install --root="$PKG_DEST" --optimize=1 -} diff --git a/repo/system/python.xibuild b/repo/system/python.xibuild deleted file mode 100644 index 7198649..0000000 --- a/repo/system/python.xibuild +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - - -MAKEDEPS="make autoconf automake autoconf-archive" -DEPS="bzip2 expat gdbm libffi libnsl libxcrypt openssl zlib grep" - -PKG_VER=3.10.2 -SOURCE=https://www.python.org/ftp/python/$PKG_VER/Python-$PKG_VER.tgz -DESC="The Python development environment" - -prepare () { - rm -r Modules/expat - rm -r Modules/_ctypes/darwin* - rm -r Modules/_ctypes/libffi* -} - -build () { - CFLAGS="-flto" - autoreconf -i - GREP="/usr/bin/ggrep" ./configure --prefix=/usr \ - --enable-shared \ - --with-system-expat \ - --with-system-ffi \ - --with-ensurepip=yes \ - --with-pip=yes \ - --with-openssl="/usr" \ - --enable-ipv6 \ - --enable-loadable-sqlite-extensions \ - --with-computed-gotos - make -} - -package () { - make DESTDIR=$PKG_DEST install - ln -s /usr/bin/python3 $PKG_DEST/usr/bin/python - ln -s /usr/bin/pip3 $PKG_DEST/usr/bin/pip -} diff --git a/repo/system/queue-standalone.xibuild b/repo/system/queue-standalone.xibuild new file mode 100644 index 0000000..c58dec8 --- /dev/null +++ b/repo/system/queue-standalone.xibuild @@ -0,0 +1,15 @@ +#!/bin/sh + +MAKEDEPS="make" +DEPS="" + +DESC="The queue.h header from glibc" + +ADDITIONAL=" + https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/queue-standalone/files/queue.h +" + +package () { + install -d $PKG_DEST/usr/include/sys/ + install -m644 queue.h $PKG_DEST/usr/include/sys/ +} diff --git a/repo/system/s6.xibuild b/repo/system/s6.xibuild index 66598dc..7f429a5 100644 --- a/repo/system/s6.xibuild +++ b/repo/system/s6.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="make" -DEPS="skalibs" +DEPS="skalibs execline" PKG_VER=2.11.0.1 SOURCE=https://skarnet.org/software/s6/s6-$PKG_VER.tar.gz |