summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure3
-rw-r--r--configure.ac3
-rw-r--r--systemtap.spec9
3 files changed, 12 insertions, 3 deletions
diff --git a/configure b/configure
index 57afc1bb..4f33313d 100755
--- a/configure
+++ b/configure
@@ -5990,12 +5990,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+# Compiling without fPIE by default (see PR 9922)
# Check whether --enable-pie was given.
if test "${enable_pie+set}" = set; then
enableval=$enable_pie;
fi
-if test "x$enable_pie" != xno; then
+if test "x$enable_pie" == xyes; then
save_CFLAGS="$CFLAGS"
save_CXXFLAGS="$CXXFLAGS"
diff --git a/configure.ac b/configure.ac
index 9d8dd7ae..f1546673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,9 +82,10 @@ AS_IF([test "x$enable_ssp" != xno],[
CFLAGS="$save_CFLAGS"
CXXFLAGS="$save_CXXFLAGS"])])
+# Compiling without fPIE by default (see PR 9922)
AC_ARG_ENABLE([pie],
[AS_HELP_STRING([--disable-pie], [disable position-independent-executable])])
-AS_IF([test "x$enable_pie" != xno],[
+AS_IF([test "x$enable_pie" == xyes],[
save_CFLAGS="$CFLAGS"
save_CXXFLAGS="$CXXFLAGS"
save_LDFLAGS="$LDFLAGS"
diff --git a/systemtap.spec b/systemtap.spec
index 020cd001..e727b49c 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -3,6 +3,7 @@
%{!?with_crash: %define with_crash 0}
%{!?with_bundled_elfutils: %define with_bundled_elfutils 0}
%{!?elfutils_version: %define elfutils_version 0.127}
+%{!?pie_supported: %define pie_supported 1}
Name: systemtap
Version: 0.9
@@ -175,9 +176,15 @@ cd ..
%define docs_config --disable-docs
%endif
+# Enable pie as configure defaults to disabling it
+%if %{pie_supported}
+%define pie_config --enable-pie
+%else
+%define pie_config --disable-pie
+%endif
-%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config}
+%configure %{?elfutils_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config}
make %{?_smp_mflags}
%install