Explicitly use -static -nopie to link memtest, just to be sure.

no pkg change, no bump.

Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/sysutils/memtest86+/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile      8 Aug 2012 20:14:21 -0000       1.5
+++ patches/patch-Makefile      31 Mar 2015 15:13:39 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile,v 1.5 2012/08/08 20:14:21 pascal Exp $
 $RuOBSD: patch-Makefile,v 1.3 2009/02/07 10:28:03 form Exp $
 --- Makefile.orig      Sun Jan 23 19:11:04 2011
-+++ Makefile   Fri Jul 20 18:50:11 2012
++++ Makefile   Tue Mar 31 17:06:38 2015
 @@ -6,33 +6,47 @@
  #
  # Path for the floppy disk device
@@ -28,16 +28,17 @@ $RuOBSD: patch-Makefile,v 1.3 2009/02/07
  # symbols and then link it dynamically so I have full
  # relocation information
 -memtest_shared: $(OBJS) memtest_shared.lds Makefile
-+memtest_shared: $(OBJS) lib.o memtest_shared.lds Makefile
-       $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
+-      $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
 -      -o $@ $(OBJS) && \
 -      $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
-+      -o $@ $(OBJS) lib.o && \
++memtest_shared: $(OBJS) lib.o memtest_shared.lds Makefile
++      $(LD) --warn-constructors --warn-common -static -nopie \
++      -T memtest_shared.lds -o $@ $(OBJS) lib.o && \
 +      $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) lib.o
  
 +memtest_shared_s: $(OBJS) lib_s.o memtest_shared.lds Makefile
-+      $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-+      -o $@ $(OBJS) lib.o && \
++      $(LD) --warn-constructors --warn-common -static -nopie \
++      -T memtest_shared.lds -o $@ $(OBJS) lib.o && \
 +      $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) lib_s.o
 +
  memtest_shared.bin: memtest_shared

Reply via email to