From adcc1c3f28958bf52139d0d76a1c314d4c2fc3e0 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 8 Jun 2020 16:46:41 -0400
Subject: Prevent libffi from putting include inside of the lib directory

---
 libffi/build.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libffi/build.sh b/libffi/build.sh
index 9b464b4..bd5a1db 100644
--- a/libffi/build.sh
+++ b/libffi/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 name=libffi
 version=3.2.1
-revision=0
+revision=1
 sources=(
     ftp://sourceware.org/pub/libffi/${name}-${version}.tar.gz
 )
@@ -31,8 +31,11 @@ function build() {
 
 function package() {
     make install DESTDIR="${_pkgdir}"
-    if [[ -d "${_pkgdir}/${_prefix}/lib64" ]]; then
-        mv "${_pkgdir}/${_prefix}/lib64"/* "${_pkgdir}/${_prefix}/lib"
-        rm -rf "${_pkgdir}/${_prefix}/lib64"
+
+    if [[ -d "${_pkgdir}${_prefix}/lib64" ]]; then
+        mv "${_pkgdir}${_prefix}/lib64"/* "${_pkgdir}${_prefix}/lib"
+        rm -rf "${_pkgdir}${_prefix}/lib64"
     fi
+    mv "${_pkgdir}${_prefix}/lib"/${name}-${version}/include "${_pkgdir}${_prefix}"
+    rm -rf "${_pkgdir}${_prefix}/lib"/${name}-${version}
 }
-- 
cgit