From fa00c959603a7e85e2e85749320454d80cb709ac Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Feb 2013 19:21:43 +0100 Subject: [PATCH] libffi: use versioned dep in -devel subpkg; drop long_desc. --- srcpkgs/libffi/libffi-devel.template | 21 +++++++-------------- srcpkgs/libffi/template | 26 +++----------------------- 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/srcpkgs/libffi/libffi-devel.template b/srcpkgs/libffi/libffi-devel.template index 143c067b641..e894937bf45 100644 --- a/srcpkgs/libffi/libffi-devel.template +++ b/srcpkgs/libffi/libffi-devel.template @@ -1,18 +1,11 @@ # Template file for 'libffi-devel'. # -depends="glibc-devel libffi" -short_desc="${sourcepkg} development files" -long_desc="${long_desc} +depends="glibc-devel libffi>=${version}" +short_desc="${short_desc} -- development files" - This package contains files for development, headers, static libs, etc." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove usr/share usr } diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template index 0a75a0c4948..f2439479736 100644 --- a/srcpkgs/libffi/template +++ b/srcpkgs/libffi/template @@ -1,38 +1,18 @@ # Template file for 'libffi' pkgname=libffi version=3.0.10 -distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz" +revision=4 build_style=gnu-configure configure_args="--includedir=/usr/include --with-pic=yes" -revision=3 short_desc="Library supporting Foreign Function Interfaces" maintainer="Juan RP " homepage="http://sourceware.org/libffi" license="MIT" +distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz" checksum=f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f -long_desc=" - The libffi library provides a portable, high level programming - interface to various calling conventions. This allows a programmer to - call any function specified by a call interface description at run-time. - - Some programs may not know at the time of compilation what arguments - are to be passed to a function. For instance, an interpreter may be - told at run-time about the number and types of arguments used to call - a given function. Libffi can be used in such programs to provide a - bridge from the interpreter program to compiled code. - - Ffi stands for Foreign Function Interface. A foreign function - interface is the popular name for the interface that allows code - written in one language to call code written in another language. - The libffi library really only provides the lowest, machine dependent - layer of a fully featured foreign function interface. A layer must - exist above libffi that handles type conversions for values passed - between the two languages." - subpackages="$pkgname-devel" -post_install() -{ +post_install() { # Fix includedir for pkg-config file. sed -i -e "s|\${libdir}/libffi-${version}|/usr|" \ ${DESTDIR}/usr/lib/pkgconfig/libffi.pc