Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
Date: 2005-01-30
Initial Package Version: 1.4.2
Upstream Status: Not submitted
Origin: None
Description: Check for gcc -fpie, -fpic, -fstack-protector, and ld -pie,
-z relro, -z now. Use whatever works. This is the autotools version. You
will need the macros to use this patch. See:
http://www.linuxfromscratch.org/~robert/Homogenic/
fpic.m4
fpie.m4
fstack.m4
relro.m4
now.m4

Then run:
aclocal -I /where/the/macros/are &&
autoconf

diff -Naur m4-1.4.2.orig/Makefile.in m4-1.4.2/Makefile.in
--- m4-1.4.2.orig/Makefile.in	2005-01-30 05:45:44.000000000 +0000
+++ m4-1.4.2/Makefile.in	2005-01-30 07:01:10.949589594 +0000
@@ -43,7 +43,7 @@
 bindir = $(exec_prefix)/bin
 infodir = $(prefix)/info
 
-MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
+MDEFINES = CC='$(CC)' LIBS='$(LIBS)' \
 prefix='$(prefix)' exec_prefix='$(exec_prefix)' \
 bindir='$(bindir)' infodir='$(infodir)'
 
diff -Naur m4-1.4.2.orig/configure.in m4-1.4.2/configure.in
--- m4-1.4.2.orig/configure.in	2005-01-30 05:45:44.000000000 +0000
+++ m4-1.4.2/configure.in	2005-01-30 07:00:19.560063016 +0000
@@ -18,6 +18,11 @@
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+_AC_PROG_CC_FPIE
+_AC_PROG_CC_FPIC
+_AC_PROG_CC_SSP
+_AC_PROG_CC_RELRO
+_AC_PROG_CC_NOW
 
 AC_AIX
 AC_ISC_POSIX
diff -Naur m4-1.4.2.orig/lib/Makefile.in m4-1.4.2/lib/Makefile.in
--- m4-1.4.2.orig/lib/Makefile.in	2005-01-30 05:45:44.000000000 +0000
+++ m4-1.4.2/lib/Makefile.in	2005-01-30 07:00:19.562062453 +0000
@@ -24,7 +24,7 @@
 
 AR = ar
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @SSPCFLAGS@ @FPICCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@
 RANLIB = @RANLIB@
diff -Naur m4-1.4.2.orig/src/Makefile.in m4-1.4.2/src/Makefile.in
--- m4-1.4.2.orig/src/Makefile.in	2005-01-30 05:45:44.000000000 +0000
+++ m4-1.4.2/src/Makefile.in	2005-01-30 07:00:19.563062172 +0000
@@ -23,12 +23,12 @@
 VPATH = @srcdir@
 
 CC = @CC@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ @FPIECFLAGS@ @SSPCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @PIELDFLAGS@ @RELROLDFLAGS@ @NOWLDFLAGS@
 LIBS = @LIBS@
 STACKOVF = @STACKOVF@