diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rwxr-xr-x[-rw-r--r--] | PKGBUILD | 75 | ||||
| -rw-r--r-- | flex-2.5.38-no-bison.patch | 52 | ||||
| -rw-r--r-- | lex.sh | 3 |
4 files changed, 31 insertions, 123 deletions
@@ -1,26 +1,16 @@ # Generated by mksrcinfo v8 -# Wed Dec 30 04:49:46 UTC 2015 +# Wed Dec 30 04:53:30 UTC 2015 pkgbase = libx32-flex - pkgdesc = A tool for generating text-scanning programs - pkgver = 2.5.39 - pkgrel = 1 + pkgdesc = A tool for generating text-scanning programs (x32 ABI) + pkgver = 2.6.0 + pkgrel = 1.1 url = http://flex.sourceforge.net arch = x86_64 - groups = base-devel license = custom - makedepends = gcc-multilib-x32 - depends = libx32-glibc - depends = m4 - depends = sh depends = flex - options = libtool - options = staticlibs - source = http://downloads.sourceforge.net/sourceforge/flex/flex-2.5.39.tar.bz2 - source = flex-2.5.38-no-bison.patch - source = lex.sh - sha256sums = add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f - sha256sums = 5ee23f97533c991b82e2aadc06d4682d7d05d99ee2abaf1ef9a82225ba9d0858 - sha256sums = 9d03016a7c4ae1adb051f50f94407b3d7dee9d55924b5c1904261c9f0c1f86f6 + depends = libx32-glibc + source = http://downloads.sourceforge.net/sourceforge/flex/flex-2.6.0.tar.bz2 + sha256sums = 24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9 pkgname = libx32-flex diff --git a/PKGBUILD b/PKGBUILD index d66ea5839a04..8cdcf5e42888 100644..100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,69 +1,42 @@ -# Upstream Maintainer: Bill Fraser <wfraser@codewise.org> +# $Id: PKGBUILD 153768 2015-12-20 11:17:56Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@archlinux.org> +# Contributor: Denommus <yuridenommus@gmail.com> +# Contributor: Bill Fraser <wfraser@codewise.org> # Contributor: Felipe Contreras <felipe.contreras@gmail.com> -# Contributor: jtts -# -# From flex's PKGBUILD: -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# -# Maintainer: Fantix King <fantix.king at gmail.com> +# x32 Maintainer: Fantix King <fantix.king at gmail.com> -_pkgbasename=flex pkgname=libx32-flex -pkgver=2.5.39 -pkgrel=1 -pkgdesc="A tool for generating text-scanning programs" +pkgver=2.6.0 +pkgrel=1.1 +pkgdesc='A tool for generating text-scanning programs (x32 ABI)' arch=('x86_64') -url="http://flex.sourceforge.net" +url='http://flex.sourceforge.net' license=('custom') -groups=('base-devel') -depends=('libx32-glibc' 'm4' 'sh' $_pkgbasename) -options=(libtool staticlibs) -makedepends=('gcc-multilib-x32') -source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 - flex-2.5.38-no-bison.patch - lex.sh) -sha256sums=('add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f' - '5ee23f97533c991b82e2aadc06d4682d7d05d99ee2abaf1ef9a82225ba9d0858' - '9d03016a7c4ae1adb051f50f94407b3d7dee9d55924b5c1904261c9f0c1f86f6') +depends=('flex' 'libx32-glibc') +source=("http://downloads.sourceforge.net/sourceforge/flex/flex-${pkgver}.tar.bz2") +sha256sums=('24e611ef5a4703a191012f80c1027dc9d12555183ce0ecd46f3636e587e9b8e9') build() { - export CC="gcc -mx32" - export CXX="g++ -mx32" - export LD="ld -mx32" - export PKG_CONFIG_PATH="/usr/libx32/pkgconfig" + cd flex-${pkgver} - cd $srcdir/$_pkgbasename-$pkgver + export CC='gcc -mx32' + export CXX='g++ -mx32' + export PKG_CONFIG_PATH='/usr/libx32/pkgconfig' -# These are no longer needed! -# patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch -# patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch -# patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch - - patch -Np1 -i $srcdir/flex-2.5.38-no-bison.patch - - ./configure --prefix=/usr --libdir=/usr/libx32 \ - --mandir=/usr/share/man --infodir=/usr/share/info + ./configure \ + --prefix='/usr' \ + --libdir='/usr/libx32' make } -check() { - cd $srcdir/$_pkgbasename-$pkgver - make check -} - package() { - cd $srcdir/$_pkgbasename-$pkgver - - make prefix=$pkgdir/usr \ - mandir=$pkgdir/usr/share/man \ - infodir=$pkgdir/usr/share/info \ - libdir=$pkgdir/usr/libx32 \ - install + cd flex-${pkgver} + make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p $pkgdir/usr/share/licenses - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s flex "${pkgdir}"/usr/share/licenses/libx32-flex } +# vim: ts=2 sw=2 et: diff --git a/flex-2.5.38-no-bison.patch b/flex-2.5.38-no-bison.patch deleted file mode 100644 index dc2ef4f305c6..000000000000 --- a/flex-2.5.38-no-bison.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- flex-2.5.37/tests/Makefile.am 2012-10-11 04:49:17.517445461 +0300 -+++ flex-2.5.37/tests/Makefile.am 2012-10-11 04:49:58.504048817 +0300 -@@ -35,9 +35,6 @@ - test-rescan-nr \ - test-basic-nr \ - test-basic-r \ -- test-bison-yylloc \ -- test-bison-yylval \ -- test-bison-nr \ - test-multiple-scanners-nr \ - test-multiple-scanners-r \ - test-header-nr \ -@@ -84,9 +81,6 @@ - test-rescan-nr \ - test-basic-nr \ - test-basic-r \ -- test-bison-yylloc \ -- test-bison-yylval \ -- test-bison-nr \ - test-multiple-scanners-nr \ - test-multiple-scanners-r \ - test-header-nr \ ---- flex-2.5.37/tests/Makefile.in 2012-10-11 04:49:35.665941427 +0300 -+++ flex-2.5.37/tests/Makefile.in 2012-10-11 04:50:21.048847253 +0300 -@@ -120,7 +120,6 @@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ --BISON = @BISON@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ -@@ -251,9 +250,6 @@ - test-rescan-nr \ - test-basic-nr \ - test-basic-r \ -- test-bison-yylloc \ -- test-bison-yylval \ -- test-bison-nr \ - test-multiple-scanners-nr \ - test-multiple-scanners-r \ - test-header-nr \ -@@ -300,9 +296,6 @@ - test-rescan-nr \ - test-basic-nr \ - test-basic-r \ -- test-bison-yylloc \ -- test-bison-yylval \ -- test-bison-nr \ - test-multiple-scanners-nr \ - test-multiple-scanners-r \ - test-header-nr \ diff --git a/lex.sh b/lex.sh deleted file mode 100644 index 13e7de69282e..000000000000 --- a/lex.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/flex -l "$@" |