Browse Source

Update disabled-packages/libffi-updated

android-5
Fredrik Fornwall 7 years ago
parent
commit
a7f0738a20
  1. 8
      disabled-packages/libffi-updated/build.sh
  2. 14
      disabled-packages/libffi-updated/configure.ac.patch
  3. 10
      disabled-packages/libffi-updated/include-Makefile.am.patch
  4. 12
      disabled-packages/libffi-updated/libffi.pc.in.patch
  5. 14
      disabled-packages/libffi-updated/src-closures.c.patch

8
disabled-packages/libffi-updated/build.sh

@ -1,11 +1,11 @@
TERMUX_PKG_HOMEPAGE=https://sourceware.org/libffi/
TERMUX_PKG_DESCRIPTION="Library providing a portable, high level programming interface to various calling conventions"
_COMMIT=60e4250a77eb3fde500bfd68ec40519fe34b21bd
_DATE=20160904
local _COMMIT=716bfd83177689e2244c4707bd513003cff92c68
local _DATE=20171105
TERMUX_PKG_VERSION=3.2.1.$_DATE
TERMUX_PKG_SHA256=454577ab2d046dbdf5697f71598247fb8d8bf2d378817d5d5b8bc5dceaf822ac
TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/archive/${_COMMIT}.zip
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-symvers=no"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory --enable-symvers=no"
TERMUX_PKG_RM_AFTER_INSTALL="lib/libffi-${TERMUX_PKG_VERSION}/include"
termux_step_pre_configure () {

14
disabled-packages/libffi-updated/configure.ac.patch

@ -1,14 +0,0 @@
See https://github.com/libffi/libffi/pull/265
diff -u -r ../libffi-60e4250a77eb3fde500bfd68ec40519fe34b21bd/configure.ac ./configure.ac
--- ../libffi-60e4250a77eb3fde500bfd68ec40519fe34b21bd/configure.ac 2016-09-04 09:34:18.000000000 -0400
+++ ./configure.ac 2016-09-14 06:43:08.916379800 -0400
@@ -197,7 +197,7 @@
[Cannot use PROT_EXEC on this target, so, we revert to
alternative means])
;;
- *-apple-darwin* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
+ *-apple-darwin* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-linux-android*)
AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
[Cannot use malloc on this target, so, we revert to
alternative means])

10
disabled-packages/libffi-updated/include-Makefile.am.patch

@ -1,10 +0,0 @@
diff -u -r ../libffi-60e4250a77eb3fde500bfd68ec40519fe34b21bd/include/Makefile.am ./include/Makefile.am
--- ../libffi-60e4250a77eb3fde500bfd68ec40519fe34b21bd/include/Makefile.am 2016-09-04 09:34:18.000000000 -0400
+++ ./include/Makefile.am 2016-09-13 10:44:07.832744478 -0400
@@ -6,5 +6,5 @@
noinst_HEADERS=ffi_common.h ffi_cfi.h
EXTRA_DIST=ffi.h.in
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
nodist_includes_HEADERS = ffi.h ffitarget.h

12
disabled-packages/libffi-updated/libffi.pc.in.patch

@ -1,12 +0,0 @@
diff -u -r ../libffi-3.1/libffi.pc.in ./libffi.pc.in
--- ../libffi-3.1/libffi.pc.in 2014-04-25 19:45:13.000000000 +0200
+++ ./libffi.pc.in 2014-07-13 22:37:09.818674529 +0200
@@ -2,7 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
toolexeclibdir=@toolexeclibdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=@includedir@
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces

14
disabled-packages/libffi-updated/src-closures.c.patch

@ -1,14 +0,0 @@
See https://github.com/libffi/libffi/pull/265
diff -u -r ../libffi-60e4250a77eb3fde500bfd68ec40519fe34b21bd/src/closures.c ./src/closures.c
--- ../libffi-60e4250a77eb3fde500bfd68ec40519fe34b21bd/src/closures.c 2016-09-04 09:34:18.000000000 -0400
+++ ./src/closures.c 2016-09-14 16:51:05.956548790 -0400
@@ -55,7 +55,7 @@
#endif
#if FFI_MMAP_EXEC_WRIT && !defined FFI_MMAP_EXEC_SELINUX
-# ifdef __linux__
+# if defined(__linux__) && !defined(__ANDROID__)
/* When defined to 1 check for SELinux and if SELinux is active,
don't attempt PROT_EXEC|PROT_WRITE mapping at all, as that
might cause audit messages. */
Loading…
Cancel
Save