diff options
author | Mike Swanson | 2016-10-01 16:17:43 -0700 |
---|---|---|
committer | Mike Swanson | 2016-10-01 16:17:43 -0700 |
commit | f85b77febd51ab25fb8afad4f5326f8548f2efa4 (patch) | |
tree | 00b6a7fcc71c2c2217de90987425b51801b16bd6 | |
parent | 4a02a87d66523f0f6350c6f3941a610e957f499b (diff) | |
download | aur-f85b77febd51ab25fb8afad4f5326f8548f2efa4.tar.gz |
Place patching commands into prepare(), use -fno-stack-protector
The latter suggestion came from felix.s on the AUR comment thread.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 18 |
3 files changed, 16 insertions, 7 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Sat Oct 1 23:14:33 UTC 2016 pkgbase = dosemu-git pkgdesc = DOS emulator - pkgver = 1.4.0.8.739.gc8f96f3 + pkgver = 1.4.0.8.753.g18f6f5c pkgrel = 1 epoch = 1 url = http://www.dosemu.org/ diff --git a/.gitignore b/.gitignore index ac22e547c2bd..5b117837b21f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pkg.tar* *.src.tar* *.tgz +/dosemu src pkg @@ -7,7 +7,7 @@ # Contributor: Bob Finch <w9ya@arrl.net> pkgname=dosemu-git -pkgver=1.4.0.8.739.gc8f96f3 +pkgver=1.4.0.8.753.g18f6f5c pkgrel=1 epoch=1 pkgdesc="DOS emulator" @@ -32,24 +32,30 @@ sha256sums=('SKIP' noextract=('dosemu-freedos-1.1-bin.tgz') pkgver() { - cd "$srcdir/dosemu" + cd "dosemu" local ver="$(git describe --long)" local ver="${ver/dosemu-/}" echo "${ver//-/.}" } -build() { - cd "$srcdir/dosemu" +prepare() { + cd "dosemu" patch -p1 -i ../debianize.patch - sed -ie '/yyget_leng/ s/int/size_t/' src/base/init/lexer.h + sed -ie 's/((no_instrument_function/&,optimize("no-stack-protector")/' \ + src/arch/linux/async/sigsegv.c src/arch/linux/async/signal.c +} + +build() { + cd "dosemu" + ./configure --prefix=/usr --with-fdtarball="$srcdir/dosemu-freedos-1.1-bin.tgz" --mandir=/usr/share/man make } package() { - cd "$srcdir/dosemu" + cd "dosemu" make DESTDIR="$pkgdir" install install -Dm 644 "$srcdir"/xdosemu.desktop "$pkgdir"/usr/share/applications/xdosemu.desktop install -Dm 644 etc/dosemu.xpm "$pkgdir"/usr/share/icons/dosemu.xpm |