|
Tim Waugh |
0bbee8 |
--- cups-1.2.1/Makedefs.in.relro 2006-07-04 17:52:05.000000000 +0100
|
|
Tim Waugh |
0bbee8 |
+++ cups-1.2.1/Makedefs.in 2006-07-04 17:52:54.000000000 +0100
|
|
Tim Waugh |
0bbee8 |
@@ -132,7 +132,7 @@
|
|
Tim Waugh |
0bbee8 |
IMGLIBS = @IMGLIBS@
|
|
Tim Waugh |
77bffe |
IMGFILTERS = @IMGFILTERS@
|
|
Tim Waugh |
0bbee8 |
LDFLAGS = -L../cups -L../filter $(ARCHFLAGS) \
|
|
Tim Waugh |
77bffe |
- @LDFLAGS@ @PIEFLAGS@ $(OPTIM)
|
|
Tim Waugh |
77bffe |
+ @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
|
|
Tim Waugh |
77bffe |
LINKCUPS = @LINKCUPS@ $(SSLLIBS)
|
|
Tim Waugh |
77bffe |
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
|
Tim Waugh |
77bffe |
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
|
Tim Waugh |
0bbee8 |
--- cups-1.2.1/config-scripts/cups-compiler.m4.relro 2006-07-04 17:52:05.000000000 +0100
|
|
Tim Waugh |
0bbee8 |
+++ cups-1.2.1/config-scripts/cups-compiler.m4 2006-07-04 17:52:05.000000000 +0100
|
|
Tim Waugh |
0bbee8 |
@@ -89,6 +89,9 @@
|
|
Tim Waugh |
77bffe |
CXXLIBS=""
|
|
Tim Waugh |
77bffe |
AC_SUBST(CXXLIBS)
|
|
Tim Waugh |
c9dd66 |
|
|
Tim Waugh |
77bffe |
+RELROFLAG=""
|
|
Tim Waugh |
77bffe |
+AC_SUBST(RELROFLAG)
|
|
Tim Waugh |
77bffe |
+
|
|
Tim Waugh |
77bffe |
PIEFLAGS=""
|
|
Tim Waugh |
77bffe |
AC_SUBST(PIEFLAGS)
|
|
Tim Waugh |
c9dd66 |
|
|
Tim Waugh |
0bbee8 |
@@ -108,6 +111,12 @@
|
|
Tim Waugh |
c9dd66 |
|
|
Tim Waugh |
77bffe |
case $uname in
|
|
Tim Waugh |
77bffe |
Linux*)
|
|
Tim Waugh |
77bffe |
+ RELROFLAG="-Wl,-z,relro"
|
|
Tim Waugh |
77bffe |
+ ;;
|
|
Tim Waugh |
77bffe |
+ esac
|
|
Tim Waugh |
77bffe |
+
|
|
Tim Waugh |
77bffe |
+ case $uname in
|
|
Tim Waugh |
77bffe |
+ Linux*)
|
|
Tim Waugh |
77bffe |
if test x$enable_pie = xyes; then
|
|
Tim Waugh |
0bbee8 |
PIEFLAGS="-pie -fPIE"
|
|
Tim Waugh |
77bffe |
fi
|