summaryrefslogtreecommitdiff
path: root/recipes/gmp
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2009-07-06 18:03:43 -0700
committerTom Rini <trini@embeddedalley.com>2009-07-06 18:03:43 -0700
commitd1767a1edbc8335f1cfd9c2975b7e8c2b283f10f (patch)
tree0fcb473439be33e180aeeab98bc7991d25e0f78d /recipes/gmp
parent178ea3236f43cb313cbd67aa0d60aad5d3680eea (diff)
gmp: Fix a problem when ${exec_prefix} != ${includedir}, switch to INC_PR
Diffstat (limited to 'recipes/gmp')
-rw-r--r--recipes/gmp/files/use-includedir.patch13
-rw-r--r--recipes/gmp/gmp-canadian_4.2.4.bb1
-rw-r--r--recipes/gmp/gmp-native_4.2.4.bb1
-rw-r--r--recipes/gmp/gmp_4.2.4.bb4
4 files changed, 18 insertions, 1 deletions
diff --git a/recipes/gmp/files/use-includedir.patch b/recipes/gmp/files/use-includedir.patch
new file mode 100644
index 0000000000..ee3891f807
--- /dev/null
+++ b/recipes/gmp/files/use-includedir.patch
@@ -0,0 +1,13 @@
+Index: gmp-4.2.4/Makefile.am
+===================================================================
+--- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000
++++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000
+@@ -106,7 +106,7 @@
+ # but anyone knowledgable enough to be playing with exec_prefix will be able
+ # to address that.
+ #
+-includeexecdir = $(exec_prefix)/include
++includeexecdir = $(includedir)
+ include_HEADERS = $(GMPXX_HEADERS_OPTION)
+ nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
+ lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION)
diff --git a/recipes/gmp/gmp-canadian_4.2.4.bb b/recipes/gmp/gmp-canadian_4.2.4.bb
index 27d179a569..63f62ace5e 100644
--- a/recipes/gmp/gmp-canadian_4.2.4.bb
+++ b/recipes/gmp/gmp-canadian_4.2.4.bb
@@ -1,5 +1,6 @@
PV = "4.2.4"
require gmp_${PV}.bb
+PR = "${INC_PR}.1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gmp-${PV}"
S = "${WORKDIR}/gmp-${PV}"
diff --git a/recipes/gmp/gmp-native_4.2.4.bb b/recipes/gmp/gmp-native_4.2.4.bb
index 1e0ffb4bed..aa927b6854 100644
--- a/recipes/gmp/gmp-native_4.2.4.bb
+++ b/recipes/gmp/gmp-native_4.2.4.bb
@@ -1,2 +1,3 @@
PV = "4.2.4"
require gmp-native.inc
+PR = "${INC_PR}.1"
diff --git a/recipes/gmp/gmp_4.2.4.bb b/recipes/gmp/gmp_4.2.4.bb
index a7aa712ddc..a9c14e6a3f 100644
--- a/recipes/gmp/gmp_4.2.4.bb
+++ b/recipes/gmp/gmp_4.2.4.bb
@@ -1,6 +1,8 @@
-PR = "r0"
+INC_PR = "r0"
+PR = "${INC_PR}.1"
SRC_URI_append += "file://sh4-asmfix.patch;patch=1 \
+ file://use-includedir.patch;patch=1 \
"
require gmp.inc
LICENSE = "GPLv3 LGPLv3"