From c71ecc3a38e9d967e59fe422dcb0a958e12d3ce9 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Mon, 26 Aug 2019 18:09:37 +0200
Subject: [PATCH 1/2] Fix build-dependancies for libassuan, libtermkey,
libtickit.
---
libassuan/recipe.spec | 6 +++++-
libtermkey/recipe.spec | 4 ++++
libtickit/recipe.spec | 3 +++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/libassuan/recipe.spec b/libassuan/recipe.spec
index 81b5c5b..b87bc08 100644
--- a/libassuan/recipe.spec
+++ b/libassuan/recipe.spec
@@ -1,4 +1,8 @@
name: libassuan
version: 2.5.3
-release: 1
+release: 2
sources: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2
+
+build-dependancies:
+ - libgpg-error
+ - libgpg-error-dev
diff --git a/libtermkey/recipe.spec b/libtermkey/recipe.spec
index 32b5383..6336f07 100644
--- a/libtermkey/recipe.spec
+++ b/libtermkey/recipe.spec
@@ -1,3 +1,7 @@
name: libtermkey
version: 0.22
sources: http://www.leonerd.org.uk/code/libtermkey/libtermkey-%{version}.tar.gz
+
+build-dependancies:
+ - pkgconf
+ - ncurses-dev
diff --git a/libtickit/recipe.spec b/libtickit/recipe.spec
index aa25e38..4493d1f 100644
--- a/libtickit/recipe.spec
+++ b/libtickit/recipe.spec
@@ -1,3 +1,6 @@
name: libtickit
version: 0.3.2
sources: http://www.leonerd.org.uk/code/libtickit/libtickit-%{version}.tar.gz
+
+build-dependancies:
+ - libtermkey
From 5702336da68d748d5a5ea7405bcd75f3b15debcb Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Mon, 26 Aug 2019 18:10:41 +0200
Subject: [PATCH 2/2] Fix binutils, busybox, libffi: %{name} => install
---
binutils/recipe.spec | 2 +-
busybox/recipe.spec | 2 +-
libffi/recipe.spec | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/binutils/recipe.spec b/binutils/recipe.spec
index 68029b5..9184776 100644
--- a/binutils/recipe.spec
+++ b/binutils/recipe.spec
@@ -8,5 +8,5 @@ options:
- make: tooldir=/usr
@install
- cd binutils-%{version} && make 'DESTDIR=%{pkg}' tooldir=/usr %{name} && rm '%{pkg}/usr/bin/strings'
+ cd binutils-%{version} && make 'DESTDIR=%{pkg}' tooldir=/usr install && rm '%{pkg}/usr/bin/strings'
diff --git a/busybox/recipe.spec b/busybox/recipe.spec
index 751c2da..22dac28 100644
--- a/busybox/recipe.spec
+++ b/busybox/recipe.spec
@@ -14,5 +14,5 @@ sources: https://busybox.net/downloads/busybox-%{version}.tar.bz2
mkdir -p '%{pkg}/usr/bin'
mkdir -p '%{pkg}/usr/sbin'
cp busybox-%{version}/busybox '%{pkg}/bin/busybox'
- chroot '%{pkg}' /bin/busybox --%{name} -s
+ chroot '%{pkg}' /bin/busybox --install -s
mv '%{pkg}/usr/sbin/killall5' '%{pkg}/sbin/'
diff --git a/libffi/recipe.spec b/libffi/recipe.spec
index f2576c6..18711b6 100644
--- a/libffi/recipe.spec
+++ b/libffi/recipe.spec
@@ -2,10 +2,11 @@ name: libffi
version: 3.2.1
release: 1
sources: ftp://sourceware.org/pub/libffi/libffi-%{version}.tar.gz
+
@install
set -e;
cd libffi-%{version};
- make DESTDIR="%{pkg}" %{name};
+ make DESTDIR="%{pkg}" install
cd "%{pkg}";
mv usr/lib/libffi-%{version}/include usr;
nuke usr/lib/libffi-%{version}