From db79c1f197d50c0f44ee64c9bdc8d591c512dfa4 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Mon, 2 Sep 2019 17:41:54 +0200 Subject: [PATCH 1/6] package: missing dependency added --- package/recipe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/recipe.spec b/package/recipe.spec index 3f21f39..f9724af 100644 --- a/package/recipe.spec +++ b/package/recipe.spec @@ -1,6 +1,6 @@ name: package version: 0.6.0 -release: 2 +release: 3 sources: - https://git.karchnu.fr/WeirdOS/package/archive/%{version}.tar.gz -> %{name}-%{version}.tar.gz - config.cfg @@ -10,7 +10,7 @@ build-dependencies: crystal, shards # 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 From e487e150bbe1360bcc8056d4e4a993d49d8a58c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Bauer?= Date: Mon, 2 Sep 2019 18:40:44 +0000 Subject: [PATCH 2/6] vim: initial commit --- vim/recipe.spec | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 vim/recipe.spec diff --git a/vim/recipe.spec b/vim/recipe.spec new file mode 100755 index 0000000..8100715 --- /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: Vim +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 + From b20edc298f9ee388d5f545df88ef7bea80032a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Bauer?= Date: Mon, 2 Sep 2019 18:41:56 +0000 Subject: [PATCH 3/6] vim: license: vim -> charityware --- vim/recipe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/recipe.spec b/vim/recipe.spec index 8100715..b9ec0e2 100755 --- a/vim/recipe.spec +++ b/vim/recipe.spec @@ -3,7 +3,7 @@ name: vim version: 8.1.1963 description: Improved vi-style text editor url: https://www.vim.org -license: Vim +license: charityware sources: https://github.com/${name}/${name}/archive/v${version} -> %{name}-%{version}.tar.gz dependencies: - ncurses From 241448a222ba6fa818221d5422b26519e13bedf0 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Tue, 3 Sep 2019 13:28:56 +0200 Subject: [PATCH 4/6] musl: recipe update Allows prefixed builds. --- musl/recipe.spec | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) 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 From 1816111f0e2b5c434e5f5941fffb24df9c239999 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Wed, 4 Sep 2019 13:31:55 +0200 Subject: [PATCH 5/6] curl: recipe update --- curl/recipe.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 From 14f9f8a2144ae5ea149d0da458bdcf8dacbd8121 Mon Sep 17 00:00:00 2001 From: Luka Vandervelden Date: Wed, 4 Sep 2019 13:33:55 +0200 Subject: [PATCH 6/6] llvm: fixes prefix --- llvm/recipe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 \