2006-04-28 13:09:58 +00:00
|
|
|
--- cups-1.2rc3/Makedefs.in.relro 2006-04-28 13:52:04.000000000 +0100
|
|
|
|
|
+++ cups-1.2rc3/Makedefs.in 2006-04-28 13:52:22.000000000 +0100
|
|
|
|
|
@@ -130,7 +130,7 @@
|
|
|
|
|
IMGLIBS = @IMGLIBS@ -lm
|
|
|
|
|
IMGFILTERS = @IMGFILTERS@
|
|
|
|
|
LDFLAGS = -L../cups -L../filter $(RC_CFLAGS) $(ARCHFLAGS) \
|
|
|
|
|
- @LDFLAGS@ @PIEFLAGS@ $(OPTIM)
|
|
|
|
|
+ @LDFLAGS@ @RELROFLAG@ @PIEFLAGS@ $(OPTIM)
|
|
|
|
|
LINKCUPS = @LINKCUPS@ $(SSLLIBS)
|
|
|
|
|
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
|
|
|
|
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
|
|
|
|
--- cups-1.2rc3/config-scripts/cups-compiler.m4.relro 2006-04-28 13:51:49.000000000 +0100
|
|
|
|
|
+++ cups-1.2rc3/config-scripts/cups-compiler.m4 2006-04-28 13:51:49.000000000 +0100
|
|
|
|
|
@@ -79,6 +79,9 @@
|
|
|
|
|
CXXLIBS=""
|
|
|
|
|
AC_SUBST(CXXLIBS)
|
2005-12-19 17:31:48 +00:00
|
|
|
|
2006-04-28 13:09:58 +00:00
|
|
|
+RELROFLAG=""
|
|
|
|
|
+AC_SUBST(RELROFLAG)
|
|
|
|
|
+
|
|
|
|
|
PIEFLAGS=""
|
|
|
|
|
AC_SUBST(PIEFLAGS)
|
2005-12-19 17:31:48 +00:00
|
|
|
|
2006-04-28 13:09:58 +00:00
|
|
|
@@ -98,6 +101,12 @@
|
2005-12-19 17:31:48 +00:00
|
|
|
|
2006-04-28 13:09:58 +00:00
|
|
|
case $uname in
|
|
|
|
|
Linux*)
|
|
|
|
|
+ RELROFLAG="-Wl,-z,relro"
|
|
|
|
|
+ ;;
|
|
|
|
|
+ esac
|
|
|
|
|
+
|
|
|
|
|
+ case $uname in
|
|
|
|
|
+ Linux*)
|
|
|
|
|
if test x$enable_pie = xyes; then
|
|
|
|
|
PIEFLAGS="-pie -fpie"
|
|
|
|
|
fi
|
