From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 8 Jan 2012 00:55:09 +0000 (+0100)
Subject: syslinux: Fix build.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb4318ec0fcd983bf73fc67a53582c5b3b18af8;p=ipfire-3.x.git

syslinux: Fix build.

Those weird CFLAGS were not required anymore and disabled
the hardening.
---

diff --git a/syslinux/syslinux.nm b/syslinux/syslinux.nm
index 36681f75a..c5897c6a2 100644
--- a/syslinux/syslinux.nm
+++ b/syslinux/syslinux.nm
@@ -5,7 +5,7 @@
 
 name       = syslinux
 version    = 4.02
-release    = 1
+release    = 2
 
 groups     = System/Boot
 url        = http://syslinux.zytor.com/
@@ -24,11 +24,14 @@ source_dl  = http://www.kernel.org/pub/linux/utils/boot/syslinux/
 build
 	requires
 		nasm
+		perl
 		python-devel
 	end
 
 	CFLAGS = -Werror -Wno-unused -finline-limit=2000
 
+	CC = gcc -std=gnu99 -fgnu89-inline
+
 	prepare_cmds
 		cd %{DIR_APP} && make clean
 	end
@@ -36,24 +39,14 @@ build
 	build
 		make installer \
 			%{PARALLELISMFLAGS} \
-			CC="gcc \
-			-std=gnu99 \
-			-fgnu89-inline \
-			-fno-pic \
-			-fno-pie \
-			-nopie"
+			CC="%{CC}"
 		make -C sample tidy
 	end
 
 	install
 		make install-all \
 			INSTALLROOT=%{BUILDROOT} \
-			CC="gcc \
-			-std=gnu99 \
-			-fgnu89-inline \
-			-fno-pic \
-			-fno-pie \
-			-nopie" \
+			CC="%{CC}" \
 			MANDIR=/usr/share/man
 
 		rm -rvf %{BUILDROOT}/{boot,tftpboot}
@@ -62,6 +55,25 @@ end
 
 packages
 	package %{name}
+
+	package %{name}-perl
+		summary = Syslinux tools written in perl.
+		description = %{summary}
+
+		files
+			%{bindir}/keytab-lilo
+			%{bindir}/lss16toppm
+			%{bindir}/md5pass
+			%{bindir}/mkdiskimage
+			%{bindir}/ppmtolss16
+			%{bindir}/pxelinux-options
+			%{bindir}/sha1pass
+			%{bindir}/syslinux2ansi
+			%{bindir}/isohybrid.pl
+			%{mandir}/man1/lss16toppm*
+			%{mandir}/man1/ppmtolss16*
+			%{mandir}/man1/syslinux2ansi*
+		end
 	end
 
 	package %{name}-debuginfo