From d053c084cfcf3dadc7a668263ef09edd8bcefb0e Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 9 Jul 2017 14:01:59 +1000 Subject: [PATCH] libffi-32: fix include path --- libffi-32/.footprint | 4 ---- libffi-32/.signature | 6 +++--- libffi-32/Pkgfile | 20 +++++++++++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libffi-32/.footprint b/libffi-32/.footprint index 61fc4709..9371e0b1 100644 --- a/libffi-32/.footprint +++ b/libffi-32/.footprint @@ -1,9 +1,5 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -drwxr-xr-x root/root usr/lib32/libffi-3.2.1/ -drwxr-xr-x root/root usr/lib32/libffi-3.2.1/include/ --rw-r--r-- root/root usr/lib32/libffi-3.2.1/include/ffi.h --rw-r--r-- root/root usr/lib32/libffi-3.2.1/include/ffitarget.h -rw-r--r-- root/root usr/lib32/libffi.a -rwxr-xr-x root/root usr/lib32/libffi.la lrwxrwxrwx root/root usr/lib32/libffi.so -> libffi.so.6.0.4 diff --git a/libffi-32/.signature b/libffi-32/.signature index b5d0f047..65171f0e 100644 --- a/libffi-32/.signature +++ b/libffi-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXRvrpNbpynsxYE/FEphGOD7GjpxLMQ0BgFseufNAItWjToWhJ3qiswZeLB8IfX1Kj4e15NUck/wV99BwhLMzVg8= -SHA256 (Pkgfile) = e4e74e5936a262f1828238b828e74ba6bf190a1427d0758f2dff72ade9c1910e -SHA256 (.footprint) = 7ec462837dd74fd3c079c54927dc0174e9e34db124997feb3cf9b390c5eacd57 +RWSwxGo/zH7eXVet8HmfFvvtGDzayf/k2nX3xoQWMRpUVGuiiF2h4Fn46e7wRxTw+wJ4Q/kCKieR0bmJNyMlMhP2YiphKyh0Iw8= +SHA256 (Pkgfile) = 564d83a783e4410b0cf9e45697ac3ea79cd45e33ce5dbd3740aef17411338bd5 +SHA256 (.footprint) = e1a967b9e67c73157ed3f0db1f1ac4bc01c9dfe476133f1084c9d9c550520b1a SHA256 (libffi-3.2.1.tar.gz) = d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 diff --git a/libffi-32/Pkgfile b/libffi-32/Pkgfile index 461e9e46..7a0261e7 100644 --- a/libffi-32/Pkgfile +++ b/libffi-32/Pkgfile @@ -1,22 +1,28 @@ # Description: Portable Foreign Function Interface Library # URL: http://sourceware.org/libffi/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu +# Depends on: libffi name=libffi-32 version=3.2.1 -release=1 -source=(ftp://sourceware.org/pub/libffi/libffi-$version.tar.gz) +release=2 +source=(https://sourceware.org/pub/${name%-*}/${name%-*}-$version.tar.gz) build() { - cd libffi-$version + cd ${name%-*}-$version + + sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \ + -i include/Makefile.in + sed \ + -e '/^includedir/ s/=.*$/=@includedir@/' \ + -e 's/^Cflags: -I${includedir}/Cflags:/' \ + -i libffi.pc.in ./configure \ --prefix=/usr \ - --libdir=/usr/lib32 \ - --mandir=/usr/man - + --libdir=/usr/lib32 make make DESTDIR=$PKG install - rm -r $PKG/usr/{man,share} + rm -r $PKG/usr/{include,share/man,share} }