Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
ea11668f
Commit
ea11668f
authored
May 11, 2021
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
version up: libffi 3.3
parent
68c58e76
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
45 deletions
+13
-45
component/libffi/buildout.cfg
component/libffi/buildout.cfg
+4
-4
component/libffi/includedir.diff
component/libffi/includedir.diff
+0
-41
component/libffi/libdir.patch
component/libffi/libdir.patch
+9
-0
No files found.
component/libffi/buildout.cfg
View file @
ea11668f
...
@@ -8,13 +8,13 @@ parts =
...
@@ -8,13 +8,13 @@ parts =
[libffi]
[libffi]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
shared = true
shared = true
version = 3.
2.1
version = 3.
3
url =
f
tp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
url =
ht
tp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
md5sum =
83b89587607e3eb65c70d361f13bab43
md5sum =
6313289e32f1d38a9df4770b014a2ca7
location = @@LOCATION@@
location = @@LOCATION@@
patch-options = -p1
patch-options = -p1
patches =
patches =
${:_profile_base_location_}/
includedir.diff#e430307d16a0d215a24ec2acff23d184
${:_profile_base_location_}/
libdir.patch#f7274250c8ca43b10e7fc968f730b833
configure-options =
configure-options =
--disable-static
--disable-static
--enable-portable-binary
--enable-portable-binary
...
...
component/libffi/includedir.diff
deleted
100644 → 0
View file @
68c58e76
Index: b/libffi.pc.in
===================================================================
--- a/libffi.pc.in
+++ b/libffi.pc.in
@@ -2,10 +2,10 @@
prefix=@prefix@
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
Version: @PACKAGE_VERSION@
-Libs: -L${toolexeclibdir} -lffi
+Libs: -L${libdir} -lffi
Cflags: -I${includedir}
Index: b/include/Makefile.am
===================================================================
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -5,5 +5,5 @@
AUTOMAKE_OPTIONS=foreign
DISTCLEANFILES=ffitarget.h
EXTRA_DIST=ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
nodist_includes_HEADERS = ffi.h ffitarget.h
Index: b/include/Makefile.in
===================================================================
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -314,7 +314,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
DISTCLEANFILES = ffitarget.h
EXTRA_DIST = ffi.h.in ffi_common.h
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includesdir = $(includedir)
nodist_includes_HEADERS = ffi.h ffitarget.h
all: all-am
component/libffi/libdir.patch
0 → 100644
View file @
ea11668f
--- a/libffi.pc.in
+++ b/libffi.pc.in
@@ -7,5 +7,5 @@
prefix=@prefix@
Name: @PACKAGE_NAME@
Description: Library supporting Foreign Function Interfaces
Version: @PACKAGE_VERSION@
-Libs: -L${toolexeclibdir} -lffi
+Libs: -L${libdir} -lffi
Cflags: -I${includedir}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment