Skip to content

Instantly share code, notes, and snippets.

@opacam
Created January 12, 2019 18:47
Show Gist options
  • Save opacam/1d5932dfbb3e1082ab1f68dd0559d667 to your computer and use it in GitHub Desktop.
Save opacam/1d5932dfbb3e1082ab1f68dd0559d667 to your computer and use it in GitHub Desktop.
Move libffi to mainline repo and update version (3.3-rc0) ¡¡¡Be careful...It's a release candidate!!!
Index: pythonforandroid/recipes/libffi/remove-version-info.patch
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- pythonforandroid/recipes/libffi/remove-version-info.patch (date 1547074008000)
+++ pythonforandroid/recipes/libffi/remove-version-info.patch (date 1547318225000)
@@ -1,12 +1,11 @@
-diff -Naur libffi/Makefile.am b/Makefile.am
---- libffi/Makefile.am 2014-11-12 06:00:59.000000000 -0600
-+++ b/Makefile.am 2015-12-23 15:57:10.363148806 -0600
-@@ -249,7 +249,7 @@
- AM_CFLAGS += -DFFI_DEBUG
- endif
-
--libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
+--- libffi/Makefile.am.orig 2018-12-21 16:11:26.159181262 +0100
++++ libffi/Makefile.am 2018-12-21 16:14:44.075179374 +0100
+@@ -156,7 +156,7 @@
+ libffi.map: $(top_srcdir)/libffi.map.in
+ $(COMPILE) -D$(TARGET) -E -x assembler-with-cpp -o $@ $<
+
+-libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS)
+libffi_la_LDFLAGS = -no-undefined -avoid-version $(LTLDFLAGS) $(AM_LTLDFLAGS)
-
+ libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep)
+
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
- AM_CCASFLAGS = $(AM_CPPFLAGS)
Index: pythonforandroid/recipes/libffi/__init__.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- pythonforandroid/recipes/libffi/__init__.py (date 1547074008000)
+++ pythonforandroid/recipes/libffi/__init__.py (date 1547318225000)
@@ -14,8 +14,8 @@
- `libltdl-dev` which defines the `LT_SYS_SYMBOL_USCORE` macro
"""
name = 'libffi'
- version = 'v3.2.1'
- url = 'https://github.com/atgreen/libffi/archive/{version}.zip'
+ version = '3.3-rc0'
+ url = 'https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz'
patches = ['remove-version-info.patch']
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment