• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/libffi/libffi-001-Fix-installation-location-of-libffi.patch
Thomas PetazzoniThomas Petazzoni committed 80e47a533be07 Feb 2013
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From 102c02de867bfe831b5366c89d66bcf170db962e Mon Sep 17 00:00:00 2001
2
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3
Date: Thu, 7 Feb 2013 22:26:56 +0100
4
Subject: [PATCH] Fix installation location of libffi
5
​
6
The libffi is currently declared as toolexeclib_LTLIBRARIES. In many
7
cases, toolexeclib libraries will be installed in /usr/lib, so it
8
doesn't make any difference.
9
​
10
However, with multilib toolchains, they get installed in a
11
subdirectory of /usr/lib/. For example, with a Sourcery CodeBench
12
PowerPC toolchain, if the e500mc multilib variant is used, the libffi
13
library gets installed in /usr/lib/te500mc/. This is due to the
14
following code in the configure script:
15
​
16
  multi_os_directory=`$CC -print-multi-os-directory`
17
  case $multi_os_directory in
18
    .) ;; # Avoid trailing /.
19
    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
20
  esac
21
​
22
Once the library is installed in /usr/lib/te500mc/, nothing works
23
because this installation location is inconsistent with the
24
installation location declared in libffi.pc.
25
​
26
So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use
27
the more standard lib_LTLIBRARIES, which ensures that the libffi
28
library is always installed in /usr/lib.
29
​
30
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
31
---
32
 Makefile.am |    2 +-
33
 1 file changed, 1 insertion(+), 1 deletion(-)
34
​
35
diff --git a/Makefile.am b/Makefile.am
36
index 6f669ca..b60bcc1 100644
37
--- a/Makefile.am
38
+++ b/Makefile.am
39
@@ -93,7 +93,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
40
 
41
 MAKEOVERRIDES=
42
 
43
-toolexeclib_LTLIBRARIES = libffi.la
44
+lib_LTLIBRARIES = libffi.la
45
 noinst_LTLIBRARIES = libffi_convenience.la
46
 
47
 libffi_la_SOURCES = src/prep_cif.c src/types.c \
48
-- 
49
1.7.9.5
50
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.