diff options
Diffstat (limited to 'multilib')
| -rw-r--r-- | multilib/dev86/PKGBUILD | 40 | ||||
| -rw-r--r-- | multilib/dev86/copt.patch | 16 | ||||
| -rw-r--r-- | multilib/dev86/mandir.patch | 34 |
3 files changed, 65 insertions, 25 deletions
diff --git a/multilib/dev86/PKGBUILD b/multilib/dev86/PKGBUILD index bde7ba3be..5175e7173 100644 --- a/multilib/dev86/PKGBUILD +++ b/multilib/dev86/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59310 2011-11-23 10:19:34Z spupykin $ +# $Id: PKGBUILD 78764 2012-10-24 11:32:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: Suat SARIALP <muhendis.suat@gmail.com> pkgname=dev86 -pkgver=0.16.18 -pkgrel=3 +pkgver=0.16.19 +pkgrel=1 pkgdesc="Simple C compiler to generate 8086 code" arch=('i686' 'x86_64') url="http://www.debath.co.uk/dev86/" @@ -18,34 +18,24 @@ else fi options=('!libtool' '!strip' '!makeflags') source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz - dev86-pic.patch - dev86-0.16.17-fortify.patch) -md5sums=('f2e06b547397383b2b2650b9c4fd9bab' - '1b750c5561a4bde5f83f65e5827feb73' - '07238f9203c6528ea1e34198e771ea12') + mandir.patch + copt.patch) +md5sums=('442e98e1afa23fe00d40c5a996385942' + '509df653dec8956faf1a40a8c544d9ce' + '32839371e28c1a04477df883e970d6cd') build() { cd $srcdir/$pkgname-$pkgver - patch -Np0 -i $srcdir/dev86-pic.patch - patch -Np1 -i $srcdir/dev86-0.16.17-fortify.patch - if [ "${CARCH}" = "x86_64" ]; then - # x86_64 fix - sed -i.orig -e 's,alt-libs elksemu,alt-libs,' \ - -e 's,install-lib install-emu,install-lib,' \ - $srcdir/$pkgname-$pkgver/makefile.in - sed -i -e "s/-O2 -g/-O2 -g -m32/" makefile.in - sed -i 's|^LDFLAGS.*=$|LDFLAGS=-m32|' makefile.in - fi + patch -p1 <$srcdir/mandir.patch + patch -p1 <$srcdir/copt.patch + echo 'quit' | make PREFIX=/usr DIST="$pkgdir" +} - unset CFLAGS - unset LDFLAGS - unset CPPFLAGS - unset CXXFLAGS +package() { + cd $srcdir/$pkgname-$pkgver - make PREFIX=/usr DIST="$pkgdir" make install-all DIST="$pkgdir" - mkdir -p $pkgdir/usr/share - mv $pkgdir/usr/man $pkgdir/usr/share + # remove all the stuff supplied by bin86 rm $pkgdir/usr/bin/{as,ld,nm,objdump,size}86 rm $pkgdir/usr/share/man/man1/{as,ld}86.1 diff --git a/multilib/dev86/copt.patch b/multilib/dev86/copt.patch new file mode 100644 index 000000000..f3dc1f310 --- /dev/null +++ b/multilib/dev86/copt.patch @@ -0,0 +1,16 @@ +diff -wbBur dev86-0.16.19.org/copt/copt.c dev86-0.16.19/copt/copt.c +--- dev86-0.16.19.org/copt/copt.c 2003-10-07 23:46:35.000000000 +0400 ++++ dev86-0.16.19/copt/copt.c 2012-10-24 15:23:48.604705265 +0400 +@@ -174,7 +174,11 @@ + /* Delete leading white spaces */ + for (cp = buf; *cp && isspace(*cp); cp++) ; + if (cp != buf && *cp) +- strcpy(buf, cp); ++ { ++ int len = strlen(cp); ++ memmove(buf, cp, len); ++ buf[len] = 0; ++ } + + return(buf); + } diff --git a/multilib/dev86/mandir.patch b/multilib/dev86/mandir.patch new file mode 100644 index 000000000..980bc3176 --- /dev/null +++ b/multilib/dev86/mandir.patch @@ -0,0 +1,34 @@ +diff -wbBur dev86-0.16.19.org/dis88/Makefile dev86-0.16.19/dis88/Makefile +--- dev86-0.16.19.org/dis88/Makefile 1998-07-31 17:01:40.000000000 +0400 ++++ dev86-0.16.19/dis88/Makefile 2012-10-24 14:46:02.684587469 +0400 +@@ -38,7 +38,7 @@ + + install: dis88 + install -m 755 -s dis88 $(DIST)$(PREFIX)/bin/dis86 +- install -m 644 dis88.1 $(DIST)$(PREFIX)/man/man1/dis86.1 ++ install -m 644 dis88.1 $(DIST)$(PREFIX)/share/man/man1/dis86.1 + + $(OBJ): dis.h a.out.h + +diff -wbBur dev86-0.16.19.org/Makefile dev86-0.16.19/Makefile +--- dev86-0.16.19.org/Makefile 2012-08-14 00:10:08.000000000 +0400 ++++ dev86-0.16.19/Makefile 2012-10-24 14:45:50.917920191 +0400 +@@ -17,7 +17,7 @@ + LIBDIR= $(PREFIX)/lib/bcc + INCLDIR= $(PREFIX)/lib/bcc + ASLDDIR= $(BINDIR) +-MANDIR= $(PREFIX)/man ++MANDIR= $(PREFIX)/share/man + CFLAGS= -O + IFDEFNAME= ifdef + +diff -wbBur dev86-0.16.19.org/man/Makefile dev86-0.16.19/man/Makefile +--- dev86-0.16.19.org/man/Makefile 1998-07-31 17:03:30.000000000 +0400 ++++ dev86-0.16.19/man/Makefile 2012-10-24 14:45:55.494587123 +0400 +@@ -1,5 +1,5 @@ + +-MANDIR=/usr/man ++MANDIR=/usr/share/man + MAN1PG=as86.1 bcc.1 elks.1 elksemu.1 ld86.1 + MAN1DIR=$(MANDIR)/man1 + |