summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-06-04 15:02:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 17:24:49 +0100
commitbdc73dfc110b363fd7e8b424c3e53b97d9a3d654 (patch)
tree21404ced9593ec90e2763acf677a14a9695c1ecf /meta/recipes-devtools
parenteaedf2e9410a08ff3594b0ec23c543c74ed1e85b (diff)
downloadpoky-bdc73dfc110b363fd7e8b424c3e53b97d9a3d654.tar.gz
rpm: Use link time check for libssp
-fstack-protector needs libssp to link with so when checking for this option support we need to find if libssp is staged in root file system (From OE-Core rev: 492297fce0b80547d3dac9f611f463c6cc95160b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch21
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb1
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch b/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
new file mode 100644
index 0000000000..0474c65a89
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch
@@ -0,0 +1,21 @@
1Some options checked in this loop are needing linking to find out
2if the option can be used or not e.g. -fstack-protector which needs
3libssp to be staged and available for compiler to link against
4Therefore we change the compile only check to compile and link check
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8
9Index: rpm-5.4.0/configure.ac
10===================================================================
11--- rpm-5.4.0.orig/configure.ac 2012-06-01 11:41:19.741480143 -0700
12+++ rpm-5.4.0/configure.ac 2012-06-01 11:41:51.773481676 -0700
13@@ -193,7 +193,7 @@
14 my_save_cflags="$CFLAGS"
15 CFLAGS=$c
16 AC_MSG_CHECKING([whether GCC supports $c])
17- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
18+ AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
19 [AC_MSG_RESULT([yes])]
20 [my_cflags=$c],
21 [AC_MSG_RESULT([no])]
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 404916a335..ccf015af3e 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -74,6 +74,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
74 file://rpm-pkgconfigdeps.patch \ 74 file://rpm-pkgconfigdeps.patch \
75 file://uclibc-support.patch \ 75 file://uclibc-support.patch \
76 file://rpmatch.patch \ 76 file://rpmatch.patch \
77 file://fstack-protector-configure-check.patch \
77 " 78 "
78 79
79SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" 80SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768"