forked from pool/syslinux
0620ccce49
%patchN syntax. - Normalize all patches to apply as -p1 + Rebased remove-note-gnu-section.patch + Rebased sysmacros.patch - Rename all *.diff files to *.patch, aligning one a common suffix: + syslinux-4.04-align.diff -> syslinux-4.04-align.patch + syslinux-4.04-cache_fix.diff -> syslinux-4.04-cache_fix.patch + syslinux-4.04-cwd.diff -> syslinux-4.04-cwd.patch + syslinux-4.04-gcc10.diff -> syslinux-4.04-gcc10.patch + syslinux-4.04-gcc47.diff -> syslinux-4.04-gcc47.patch + syslinux-4.04-geometry.diff -> syslinux-4.04-geometry.patch + syslinux-4.04-iso9660.diff -> syslinux-4.04-iso9660.patch + syslinux-4.04-isohybrid_efi.diff -> syslinux-4.04-isohybrid_efi.patch + syslinux-4.04-isohybrid_efi_optional.diff -> syslinux-4.04-isohybrid_efi_optional.patch + syslinux-4.04-isohybrid_mbr.diff -> syslinux-4.04-isohybrid_mbr.patch + syslinux-4.04-libext2fs.diff -> syslinux-4.04-libext2fs.patch + syslinux-4.04-localboot.diff -> syslinux-4.04-localboot.patch + syslinux-4.04-lzo.diff -> syslinux-4.04-lzo.patch + syslinux-4.04-mboot_bootif.diff -> syslinux-4.04-mboot_bootif.patch + syslinux-4.04-md5pass.diff -> syslinux-4.04-md5pass.patch + syslinux-4.04-miniacc.diff -> syslinux-4.04-miniacc.patch + syslinux-4.04-mtime.diff -> syslinux-4.04-mtime.patch + syslinux-4.04-noinitrd.diff -> syslinux-4.04-noinitrd.patch + syslinux-4.04-nostrip.diff -> syslinux-4.04-nostrip.patch + syslinux-4.04-pie.diff -> syslinux-4.04-pie.patch + syslinux-4.04-python3.diff -> syslinux-4.04-python3.patch + syslinux-4.04-timeout.diff -> syslinux-4.04-timeout.patch OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=109
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
Index: syslinux-4.04/utils/Makefile
|
|
===================================================================
|
|
--- syslinux-4.04.orig/utils/Makefile
|
|
+++ syslinux-4.04/utils/Makefile
|
|
@@ -17,8 +17,8 @@
|
|
topdir = ..
|
|
include $(topdir)/MCONFIG
|
|
|
|
-CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
|
|
-LDFLAGS = -O2 -g
|
|
+CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -fPIC $(OPTFLAGS)
|
|
+LDFLAGS += -O2 -g -pie
|
|
|
|
TARGETS = mkdiskimage isohybrid gethostip memdiskfind
|
|
TARGETS += isohybrid.pl # about to be obsoleted
|
|
Index: syslinux-4.04/extlinux/Makefile
|
|
===================================================================
|
|
--- syslinux-4.04.orig/extlinux/Makefile
|
|
+++ syslinux-4.04/extlinux/Makefile
|
|
@@ -20,8 +20,8 @@ include $(topdir)/MCONFIG
|
|
OPTFLAGS = -g -Os
|
|
INCLUDES = -I. -I.. -I../libinstaller
|
|
CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
|
|
- $(OPTFLAGS) $(INCLUDES)
|
|
-LDFLAGS = # -s
|
|
+ -fPIC $(OPTFLAGS) $(INCLUDES)
|
|
+LDFLAGS += -pie # -s
|
|
|
|
SRCS = main.c \
|
|
../libinstaller/syslxmod.c \
|
|
Index: syslinux-4.04/mtools/Makefile
|
|
===================================================================
|
|
--- syslinux-4.04.orig/mtools/Makefile
|
|
+++ syslinux-4.04/mtools/Makefile
|
|
@@ -3,8 +3,8 @@ include $(topdir)/MCONFIG
|
|
|
|
OPTFLAGS = -g -Os
|
|
INCLUDES = -I. -I.. -I../libfat -I../libinstaller
|
|
-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
-LDFLAGS = -s
|
|
+CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 -fPIC $(OPTFLAGS) $(INCLUDES)
|
|
+LDFLAGS += -s -pie
|
|
|
|
SRCS = syslinux.c \
|
|
../libinstaller/fat.c \
|
|
Index: syslinux-4.04/core/Makefile
|
|
===================================================================
|
|
--- syslinux-4.04.orig/core/Makefile
|
|
+++ syslinux-4.04/core/Makefile
|
|
@@ -138,3 +138,4 @@ spotless: clean
|
|
|
|
# Include dependencies file
|
|
-include .*.d */.*.d */*/.*.d
|
|
+
|
|
Index: syslinux-4.04/linux/Makefile
|
|
===================================================================
|
|
--- syslinux-4.04.orig/linux/Makefile
|
|
+++ syslinux-4.04/linux/Makefile
|
|
@@ -20,7 +20,8 @@ include $(topdir)/MCONFIG
|
|
OPTFLAGS = -g -O0 -Dalloca=malloc
|
|
INCLUDES = -I. -I.. -I../libinstaller
|
|
CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
-LDFLAGS =
|
|
+CFLAGS += -fPIC
|
|
+LDFLAGS = -pie
|
|
|
|
SRCS = syslinux.c \
|
|
../libinstaller/syslxopt.c \
|