diff options
| author | Peter Bui <pnutzh4x0r@gmail.com> | 2014-11-06 10:12:08 -0600 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-07 06:59:55 +0000 |
| commit | d968a96139fcc2f78ea425e542edde1947a4af6c (patch) | |
| tree | 6483c0d288162e2b18601cfa22306bfc837bb379 /main/pcmciautils | |
| parent | 3bb55faf0c0fcf1398369110fb9256fe2459f7e4 (diff) | |
| download | aports-d968a96139fcc2f78ea425e542edde1947a4af6c.tar.bz2 aports-d968a96139fcc2f78ea425e542edde1947a4af6c.tar.xz | |
main/pcmciautils: fix build
Add patch to change u_{int,long} to unsigned {int, long}.
ref #2976
Diffstat (limited to 'main/pcmciautils')
| -rw-r--r-- | main/pcmciautils/APKBUILD | 29 | ||||
| -rw-r--r-- | main/pcmciautils/unsigned.patch | 22 |
2 files changed, 44 insertions, 7 deletions
diff --git a/main/pcmciautils/APKBUILD b/main/pcmciautils/APKBUILD index d993a03907..31bf510c43 100644 --- a/main/pcmciautils/APKBUILD +++ b/main/pcmciautils/APKBUILD @@ -4,23 +4,38 @@ pkgver=018 pkgrel=0 pkgdesc="Utilities for inserting and removing PCMCIA cards" url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" -arch="" +arch="all" license="GPL" subpackages="$pkgname-doc" depends= makedepends="sysfsutils-dev bison flex" -source="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz" +source="ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + unsigned.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} build() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make -j1 LEX=flex || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir"/ install ln -sf pccardctl "$pkgdir"/sbin/lspcmcia } -md5sums="2e9469c44dcb790d2b497723c2fa0566 pcmciautils-018.tar.xz" -sha256sums="a5c09abeba95f750e8a8b01704114d733f0f0345f34e5c327bbb6a1bfd09c4b8 pcmciautils-018.tar.xz" -sha512sums="c7c1ecde41a60d3d1fcb12e3be309f8287d0242ad93e17b1286bf2818a0de1f415c89f63fec0571264e5ff87e99ba7ded905e6b671c2f6795ea910a0045261f5 pcmciautils-018.tar.xz" +md5sums="2e9469c44dcb790d2b497723c2fa0566 pcmciautils-018.tar.xz +ba7aa35c8082cf2ca67785cd8f7f9524 unsigned.patch" +sha256sums="a5c09abeba95f750e8a8b01704114d733f0f0345f34e5c327bbb6a1bfd09c4b8 pcmciautils-018.tar.xz +6f08ef800e0cf1d1b73cd51dfe2f60fb8d1b410150b2f52e32b1439af9fc5f6d unsigned.patch" +sha512sums="c7c1ecde41a60d3d1fcb12e3be309f8287d0242ad93e17b1286bf2818a0de1f415c89f63fec0571264e5ff87e99ba7ded905e6b671c2f6795ea910a0045261f5 pcmciautils-018.tar.xz +18e5d3bfe3316c49e4a899b9181177c1c275274d5788a4af7299d0c6b8cbdfca8f3465f242356d35c6e96103cb620173e6f93e7e66787d5d2b194c5a4264bf91 unsigned.patch" diff --git a/main/pcmciautils/unsigned.patch b/main/pcmciautils/unsigned.patch new file mode 100644 index 0000000000..8781068f8d --- /dev/null +++ b/main/pcmciautils/unsigned.patch @@ -0,0 +1,22 @@ +--- pcmciautils-018/src/read-cis.c.orig 2014-11-06 10:07:20.363207536 +0600 ++++ pcmciautils-018/src/read-cis.c 2014-11-06 10:08:37.143611772 +0600 +@@ -51,7 +51,7 @@ + /* Get indirect link from the MFC tuple */ + read_cis(tuple->Flags.link_space, + tuple->LinkOffset, 5, link); +- ofs = *(u_int *)(link+1); ++ ofs = *(unsigned int *)(link+1); + tuple->Flags.space = (link[0] == CISTPL_MFC_ATTR); + /* Move to the next indirect link */ + tuple->LinkOffset += 5; +--- pcmciautils-018/src/yacc_config.y.orig 2014-11-06 10:08:55.857046934 +0600 ++++ pcmciautils-018/src/yacc_config.y 2014-11-06 10:09:10.543788999 +0600 +@@ -40,7 +40,7 @@ + + %union { + char *str; +- u_long num; ++ unsigned long num; + struct adjust_list_t *adjust; + } + |