From 9c7eb23ddd08af0728f6f436aa65dcd737e0f6cd Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Wed, 4 Sep 2019 13:38:49 +0200
Subject: [PATCH 1/4] Package recipe: new version, shards removed, adding
spec-parser dep
---
package/recipe.spec | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/recipe.spec b/package/recipe.spec
index 3f21f39..bb2fa3a 100644
--- a/package/recipe.spec
+++ b/package/recipe.spec
@@ -1,11 +1,11 @@
name: package
-version: 0.6.0
-release: 2
+version: 0.7.0
+release: 1
sources:
- https://git.karchnu.fr/WeirdOS/package/archive/%{version}.tar.gz -> %{name}-%{version}.tar.gz
- config.cfg
-build-dependencies: crystal, shards
+build-dependencies: crystal, spec-parser
# FIXME: FIXME: Build this statically in.
# FIXME: bsdtar should be split out so that we depend only on it.
# Busybox is required mostly for `wget`.
@@ -14,8 +14,8 @@ dependencies: gc, libevent, pcre, libarchive, busybox, zsh, abuild
dirname: package
@configure
- cd %{dirname}
- shards install
+ true
+
@build
cd %{dirname}
make PREFIX="%{prefix}" SYSCONFDIR="/etc"
From 22b9aae7015fb0fa6f68db4a551790a3a3cfe9ab Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Wed, 4 Sep 2019 13:42:11 +0200
Subject: [PATCH 2/4] binutils recipe: using %{prefix}
---
binutils/recipe.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/binutils/recipe.spec b/binutils/recipe.spec
index 9184776..73c2b0d 100644
--- a/binutils/recipe.spec
+++ b/binutils/recipe.spec
@@ -1,6 +1,6 @@
name: binutils
version: 2.32
-release: 1
+release: 2
sources: https://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.xz
options:
- configure: --disable-multilib --with-pic --disable-nls
@@ -8,5 +8,6 @@ options:
- make: tooldir=/usr
@install
- cd binutils-%{version} && make 'DESTDIR=%{pkg}' tooldir=/usr install && rm '%{pkg}/usr/bin/strings'
-
+ cd binutils-%{version}
+ make 'DESTDIR=%{pkg}' tooldir=/usr install
+ rm '%{pkg}/%{prefix}/bin/strings'
From a073fb6b1f1c265dc497a9e308dde8bef02b054c Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Wed, 4 Sep 2019 13:42:33 +0200
Subject: [PATCH 3/4] gcc recipe: using %{prefix}
---
gcc/recipe.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gcc/recipe.spec b/gcc/recipe.spec
index a3bc2ad..91282de 100644
--- a/gcc/recipe.spec
+++ b/gcc/recipe.spec
@@ -19,8 +19,8 @@ dirname: build
fi
../gcc-%{version}/configure \
- --prefix=/usr \
- --libdir=/usr/lib \
+ --prefix=%{prefix} \
+ --libdir=%{prefix}/lib \
--disable-multilib \
--disable-libssp \
--disable-libmpx \
@@ -32,4 +32,3 @@ dirname: build
--target=x86_64-weird-linux-musl \
--build=x86_64-weird-linux-musl \
--host=x86_64-weird-linux-musl
-
From 032aa625843a1736fe8c061200b14ad784d349a3 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Wed, 4 Sep 2019 13:43:57 +0200
Subject: [PATCH 4/4] new recipes: file, spec-parser
---
file/recipe.spec | 9 +++++++++
spec-parser/recipe.spec | 16 ++++++++++++++++
2 files changed, 25 insertions(+)
create mode 100644 file/recipe.spec
create mode 100644 spec-parser/recipe.spec
diff --git a/file/recipe.spec b/file/recipe.spec
new file mode 100644
index 0000000..8f6baef
--- /dev/null
+++ b/file/recipe.spec
@@ -0,0 +1,9 @@
+name: file
+version: 5.37
+release: 1
+sources: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
+dependencies: zlib
+build-dependencies: make, musl-dev, zlib-dev
+
+options:
+ - configure: --enable-zlib --disable-libseccomp
diff --git a/spec-parser/recipe.spec b/spec-parser/recipe.spec
new file mode 100644
index 0000000..cc2addc
--- /dev/null
+++ b/spec-parser/recipe.spec
@@ -0,0 +1,16 @@
+name: spec-parser
+release: 2
+version: 0.4.5
+sources: https://git.karchnu.fr/WeirdOS/recipes-parser/archive/spec-parser-%{version}.tar.gz
+
+@configure
+ true
+
+@build
+ true
+
+# dirname: %{name}-%{version}
+dirname: recipes-parser
+@install
+ mkdir -p %{pkg}/usr/lib/crystal
+ cp %{dirname}/src/specfileparser.cr %{pkg}/usr/lib/crystal/