aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-04-29 12:12:25 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-04-29 12:12:25 +0000
commit7fdc5f7dad7c1c775d73074b56276a62bf15c19a (patch)
tree5605ba9a97a7d88b570905e40e728ecb35bf3f25 /main
parent80443ec9989ec738c5de3489e3ea00f2f7c402c0 (diff)
downloadaports-7fdc5f7dad7c1c775d73074b56276a62bf15c19a.tar.bz2
aports-7fdc5f7dad7c1c775d73074b56276a62bf15c19a.tar.xz
main/syslinux: upgrade to 3.86
Diffstat (limited to 'main')
-rw-r--r--main/syslinux/APKBUILD19
-rw-r--r--main/syslinux/syslinux-3.72-nopie.patch12
-rw-r--r--main/syslinux/syslinux-3.86-nopie.patch11
3 files changed, 23 insertions, 19 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index e543f31f6e..5fd6f2f5a0 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=syslinux
-pkgver=3.85
+pkgver=3.86
pkgrel=0
pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem."
url="http://syslinux.org"
@@ -8,21 +8,26 @@ license="GPL"
makedepends="nasm perl"
depends="mtools"
source="http://www.kernel.org/pub/linux/utils/boot/$pkgname/$pkgname-$pkgver.tar.bz2
- $pkgname-3.72-nopie.patch
+ $pkgname-3.86-nopie.patch
"
subpackages="$pkgname-doc"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ patch -p1 < ../$pkgname-3.86-nopie.patch || return 1
+}
+
build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 < ../$pkgname-3.72-nopie.patch || return 1
+ cd "$_builddir"
unset LDFLAGS
make installer || return 1
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$_builddir"
make INSTALLROOT="$pkgdir" MANDIR=/usr/share/man local-install
}
-md5sums="416e64e3e9b1f838e393c809ff83e792 syslinux-3.85.tar.bz2
-c08398d165d29e48711e55058e2897de syslinux-3.72-nopie.patch"
+md5sums="d6fb0231e82190b4932b2aa20274911a syslinux-3.86.tar.bz2
+5852d62ba0772cf967156a75451e6066 syslinux-3.86-nopie.patch"
diff --git a/main/syslinux/syslinux-3.72-nopie.patch b/main/syslinux/syslinux-3.72-nopie.patch
deleted file mode 100644
index 2662d17b43..0000000000
--- a/main/syslinux/syslinux-3.72-nopie.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/com32/MCONFIG b/com32/MCONFIG
---- a/com32/MCONFIG 2008-09-26 01:46:02.000000000 +0200
-+++ b/com32/MCONFIG 2008-10-28 16:10:16.107964907 +0100
-@@ -19,6 +19,8 @@
- GCCOPT := $(call gcc_ok,-std=gnu99,) \
- $(call gcc_ok,-m32,) \
- $(call gcc_ok,-fno-stack-protector,) \
-+ $(call gcc_ok,-nopie,) \
-+ $(call gcc_ok,-fno-pie,) \
- -mregparm=3 -DREGPARM=3 -march=i386 -Os
-
- com32 = $(topdir)/com32
diff --git a/main/syslinux/syslinux-3.86-nopie.patch b/main/syslinux/syslinux-3.86-nopie.patch
new file mode 100644
index 0000000000..262a4c15ca
--- /dev/null
+++ b/main/syslinux/syslinux-3.86-nopie.patch
@@ -0,0 +1,11 @@
+--- ./com32/MCONFIG.orig
++++ ./com32/MCONFIG
+@@ -25,6 +25,8 @@
+ $(call gcc_ok,-falign-loops=0,-malign-loops=0) \
+ $(call gcc_ok,-mpreferred-stack-boundary=2,) \
+ $(call gcc_ok,-mincoming-stack-boundary=2,) \
++ $(call gcc_ok,-nopie,) \
++ $(call gcc_ok,-fno-pie,) \
+ -march=i386 -Os -fomit-frame-pointer -mregparm=3 -DREGPARM=3
+
+ com32 = $(topdir)/com32