Fix paths in libffi.pc.in

(upstream git commit ad0d1d239afc7ad09203847793dcc020856d1035)

This unbreaks lua-lgi runtime

with jasper@ and Lauri Tirkkonen
This commit is contained in:
dcoppa 2015-04-24 13:48:27 +00:00
parent 8e76b38919
commit 42b4f2ecf1
2 changed files with 39 additions and 2 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.29 2015/04/06 12:11:39 jasper Exp $
# $OpenBSD: Makefile,v 1.30 2015/04/24 13:48:27 dcoppa Exp $
COMMENT= Foreign Function Interface
DISTNAME= libffi-3.1
REVISION= 0
SHARED_LIBS += ffi 1.1 # .6.2
CATEGORIES= devel
@ -17,7 +18,8 @@ MASTER_SITES= ftp://sourceware.org/pub/libffi/
TEST_DEPENDS= devel/dejagnu
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
FAKE_FLAGS+= includesdir="${PREFIX}/include"

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-configure_ac,v 1.4 2015/04/24 13:48:27 dcoppa Exp $
commit ad0d1d239afc7ad09203847793dcc020856d1035
Author: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu Jun 12 06:30:21 2014 -0400
Fix paths in libffi.pc.in
--- configure.ac.orig Sun May 11 15:57:49 2014
+++ configure.ac Fri Apr 24 15:41:51 2015
@@ -590,11 +590,11 @@ AC_ARG_ENABLE(purify-safety,
if test "x$GCC" = "xyes"; then
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
- toolexecdir='$(exec_prefix)/$(target_alias)'
- toolexeclibdir='$(toolexecdir)/lib'
+ toolexecdir="${exec_prefix}"/'$(target_alias)'
+ toolexeclibdir="${toolexecdir}"/lib
else
- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
- toolexeclibdir='$(libdir)'
+ toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
+ toolexeclibdir="${libdir}"
fi
multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
case $multi_os_directory in
@@ -603,7 +603,7 @@ if test "x$GCC" = "xyes"; then
esac
AC_SUBST(toolexecdir)
else
- toolexeclibdir='$(libdir)'
+ toolexeclibdir="${libdir}"
fi
AC_SUBST(toolexeclibdir)