diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2012-06-04 15:02:13 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-15 15:54:18 +0100 |
| commit | 492297fce0b80547d3dac9f611f463c6cc95160b (patch) | |
| tree | c07229f9a0ba59decffa1989eb9332dccda2cc05 /meta/recipes-devtools/rpm | |
| parent | 0cd3a4f3cfd0eb70915e3b59be8d04ee2d92749e (diff) | |
| download | openembedded-core-contrib-492297fce0b80547d3dac9f611f463c6cc95160b.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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-devtools/rpm')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/fstack-protector-configure-check.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 1 |
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 @@ +Some options checked in this loop are needing linking to find out +if the option can be used or not e.g. -fstack-protector which needs +libssp to be staged and available for compiler to link against +Therefore we change the compile only check to compile and link check + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: rpm-5.4.0/configure.ac +=================================================================== +--- rpm-5.4.0.orig/configure.ac 2012-06-01 11:41:19.741480143 -0700 ++++ rpm-5.4.0/configure.ac 2012-06-01 11:41:51.773481676 -0700 +@@ -193,7 +193,7 @@ + my_save_cflags="$CFLAGS" + CFLAGS=$c + AC_MSG_CHECKING([whether GCC supports $c]) +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([])], + [AC_MSG_RESULT([yes])] + [my_cflags=$c], + [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 file://rpm-pkgconfigdeps.patch \ file://uclibc-support.patch \ file://rpmatch.patch \ + file://fstack-protector-configure-check.patch \ " SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |