diff --git a/curl/recipe.spec b/curl/recipe.spec index f5f8db6..3ed96ab 100644 --- a/curl/recipe.spec +++ b/curl/recipe.spec @@ -1,20 +1,20 @@ name: curl version: 7.65.3 -release: 1 +release: 2 sources: https://curl.haxx.se/download/curl-%{version}.tar.gz build-dependencies: make, openssl-dev -dirname: %{name}-%{version} @configure - cd %{dirname} + cd %{name}-%{version} ./configure \ - --enable-ipv6 \ - --enable-unix-sockets \ - --enable-static \ - --enable-openssl \ - --without-libidn \ - --without-libidn2 \ - --with-nghttp2 \ - --disable-ldap \ - --with-pic \ - --without-libssh2 # https://bugs.alpinelinux.org/issues/10222 + --prefix="%{prefix}" \ + --enable-ipv6 \ + --enable-unix-sockets \ + --enable-static \ + --enable-openssl \ + --without-libidn \ + --without-libidn2 \ + --with-nghttp2 \ + --disable-ldap \ + --with-pic \ + --without-libssh2 # https://bugs.alpinelinux.org/issues/10222 diff --git a/llvm/recipe.spec b/llvm/recipe.spec index 6e222c2..01f69ec 100644 --- a/llvm/recipe.spec +++ b/llvm/recipe.spec @@ -1,6 +1,6 @@ name: llvm version: 8.0.1 -release: 1 +release: 2 sources: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/llvm-%{version}.src.tar.xz dependencies: - libffi @@ -9,7 +9,7 @@ dependencies: mkdir %{name}-%{version} cd %{name}-%{version} && \ cmake ../llvm-%{version}.src \ - -DCMAKE_INSTALL_PREFIX=/usr/weirdos/%{name} \ + -DCMAKE_INSTALL_PREFIX="%{prefix}" \ -DLLVM_BUILD_DOCS=OFF\ -DLLVM_BUILD_EXAMPLES=OFF \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \ diff --git a/musl/recipe.spec b/musl/recipe.spec index 1ddaef1..848a634 100644 --- a/musl/recipe.spec +++ b/musl/recipe.spec @@ -2,25 +2,48 @@ name: musl version: 1.1.23 release: 3 sources: https://www.musl-libc.org/releases/musl-%{version}.tar.gz -options: - - configure: --prefix=/usr --libdir=/lib --syslibdir=/lib --enable-shared --enable-static + +# Edit this if you somehow need to build a prefixed version of musl. +prefix: / + +@configure + cd %{name}-%{version} + + libdir=/lib + prefix=/usr/weirdos + if [ "%{prefix}" != "/" ]; then + prefix="%{prefix}" + libdir="%{prefix}/lib" + fi + + ./configure \ + --prefix=$prefix \ + --libdir=$libdir \ + --syslibdir=$libdir \ + --enable-shared \ + --enable-static @install cd %{name}-%{version} + libdir=/lib + if [ "%{prefix}" != "/" ]; then + libdir="%{prefix}/lib" + fi + make DESTDIR="%{pkg}" install # FIXME: This’ll have to eventually be more automated. # FIXME: That path has to be edited on other architectures. mkdir -p %{pkg}/etc { - echo /lib + echo $libdir echo /usr/weirdos/lib echo /usr/bad/lib echo /usr/local/lib } > %{pkg}/etc/ld-musl-x86_64.path for lib in libm libpthread librt libdl; do - ln -s /lib/libc.so "%{pkg}/lib/${lib}.so" + ln -s $libdir/libc.so "%{pkg}$libdir/${lib}.so" done diff --git a/package/recipe.spec b/package/recipe.spec index bb2fa3a..edbd13c 100644 --- a/package/recipe.spec +++ b/package/recipe.spec @@ -10,7 +10,7 @@ build-dependencies: crystal, spec-parser # FIXME: bsdtar should be split out so that we depend only on it. # Busybox is required mostly for `wget`. # abuild and zsh are required for assemble-apk. -dependencies: gc, libevent, pcre, libarchive, busybox, zsh, abuild +dependencies: gc, libevent, pcre, libarchive, busybox, zsh, abuild, gnutar dirname: package @configure diff --git a/vim/recipe.spec b/vim/recipe.spec new file mode 100755 index 0000000..b9ec0e2 --- /dev/null +++ b/vim/recipe.spec @@ -0,0 +1,17 @@ +packager: Mickaël Bauer +name: vim +version: 8.1.1963 +description: Improved vi-style text editor +url: https://www.vim.org +license: charityware +sources: https://github.com/${name}/${name}/archive/v${version} -> %{name}-%{version}.tar.gz +dependencies: + - ncurses + +options: + - configure: --with-tlib=ncursesw +@install + cd %{name}-%{version} + make DESTDIR=%{pkg} install + rm %{pkg}%{prefix}/bin/xxd +