diff options
| -rw-r--r-- | trunk/ChangeLog.cross | 10 | ||||
| -rw-r--r-- | trunk/configure.in | 10 | ||||
| -rw-r--r-- | trunk/src/Makefile.am | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/trunk/ChangeLog.cross b/trunk/ChangeLog.cross index 2257aa7..d4f922f 100644 --- a/trunk/ChangeLog.cross +++ b/trunk/ChangeLog.cross @@ -1,15 +1,19 @@ -2007-08-08 Mark Hatle <mark.hatle@windriver.com> +2010-06-14 Mark Hatle <mark.hatle@windriver.com> + * configure.in: Add option to disable selinux + * src/Makefile.am: Stop static linking + +2007-08-08 Mark Hatle <mark.hatle@windriver.com> * src/arch-mips.c: add /lib32/ld.so.1 as an alternative 32-bit linker * src/ld-libs.c: add a check for MIPS n32, and adjust ld_dirs as necessary -2007-10-11 Richard Sandiford <richard@codesourcery.com> +2007-10-11 Richard Sandiford <richard@codesourcery.com> * src/space.c (find_readonly_space): If a new PT_LOAD header is needed, first try removing a PT_NULL header. -2006-12-04 Mark Hatle <mark.hatle@windriver.com> +2006-12-04 Mark Hatle <mark.hatle@windriver.com> * Merge code from: diff --git a/trunk/configure.in b/trunk/configure.in index 396f3ac..f99a0d9 100644 --- a/trunk/configure.in +++ b/trunk/configure.in @@ -69,6 +69,16 @@ if test "x$ac_cv_ftw_actionretval" = xyes; then fi dnl SELinux checks +AC_ARG_ENABLE(selinux, + AS_HELP_STRING([--disable-selinux], + [Disable selinux support in the prelinker]), + [ enable_selinux="$enableval" ], + [ enable_selinux="yes" ]) + +if test "x$enable_selinux" != "no"; then + ac_cv_lib_selinux_is_selinux_enabled=disabled +fi + AC_CHECK_LIB(selinux,is_selinux_enabled) AC_CHECK_HEADERS(selinux/selinux.h) diff --git a/trunk/src/Makefile.am b/trunk/src/Makefile.am index 6981801..6db7b2c 100644 --- a/trunk/src/Makefile.am +++ b/trunk/src/Makefile.am @@ -22,13 +22,15 @@ prelink_SOURCES = cache.c conflict.c cxx.c doit.c exec.c execle_open.c get.c \ verify.c md5.c md5.h sha.c sha.h \ $(common_SOURCES) $(arch_SOURCES) prelink_LDADD = @LIBGELF@ -liberty -prelink_LDFLAGS = -all-static +prelink_LDFLAGS = execstack_SOURCES = execstack.c $(common_SOURCES) $(arch_SOURCES) +execstack_LDADD = -liberty +execstack_LDFLAGS = -prelink_rtld_LDADD = @LIBGELF@ -liberty prelink_rtld_SOURCES = data.c dso-readonly.c ld-libs.c ld-lookup.c \ canonicalize.c wrap-file.c ld-lookup64.c -prelink_rtld_LDFLAGS = -all-static +prelink_rtld_LDADD = @LIBGELF@ -liberty +prelink_rtld_LDFLAGS = extra_DIST = makecrc.c |