summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2016-10-01 16:17:43 -0700
committerMike Swanson2016-10-01 16:17:43 -0700
commitf85b77febd51ab25fb8afad4f5326f8548f2efa4 (patch)
tree00b6a7fcc71c2c2217de90987425b51801b16bd6
parent4a02a87d66523f0f6350c6f3941a610e957f499b (diff)
downloadaur-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--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD18
3 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50e0f4172da..c4b555ab87b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 ac22e547c2b..5b117837b21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.pkg.tar*
*.src.tar*
*.tgz
+/dosemu
src
pkg
diff --git a/PKGBUILD b/PKGBUILD
index 3e558db396e..e33b29dd36a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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