diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2014-04-03 10:10:33 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2014-04-03 10:10:33 +0000 |
| commit | da11ca3495d429ce48502e6a71ec25843b769bcf (patch) | |
| tree | aaf4e959ee77e2c5d0c0f7934364425f8b920929 /main | |
| parent | c8f77ddc16be4e49d8995c2491470dff2e9bee77 (diff) | |
| download | aports-da11ca3495d429ce48502e6a71ec25843b769bcf.tar.bz2 aports-da11ca3495d429ce48502e6a71ec25843b769bcf.tar.xz | |
main/flashrom: fix musl build
Diffstat (limited to 'main')
| -rw-r--r-- | main/flashrom/APKBUILD | 16 | ||||
| -rw-r--r-- | main/flashrom/spi-ioctl.patch | 33 |
2 files changed, 43 insertions, 6 deletions
diff --git a/main/flashrom/APKBUILD b/main/flashrom/APKBUILD index 507a4e2f3f..bdfe3ef286 100644 --- a/main/flashrom/APKBUILD +++ b/main/flashrom/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Nathan Angelacos <nangel@alpinelinux.org> pkgname=flashrom pkgver=0.9.7 -pkgrel=0 +pkgrel=1 pkgdesc="A utility for identifying, reading, writing, verifying and erasing flash chips" url="http://www.flashrom.org/Flashrom" arch="all" @@ -11,13 +11,14 @@ depends=dmidecode makedepends=pciutils-dev subpackages="$pkgname-doc" install="$pkgname.post-install" -source="http://download.flashrom.org/releases/flashrom-$pkgver.tar.bz2" +source="http://download.flashrom.org/releases/flashrom-$pkgver.tar.bz2 + spi-ioctl.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # apply patches here + patch -p1 < "$srcdir"/spi-ioctl.patch } build() { @@ -30,6 +31,9 @@ package() { make PREFIX="$pkgdir/usr/" install } -md5sums="d239bafa1b46619d851f70f84a5b122a flashrom-0.9.7.tar.bz2" -sha256sums="5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9 flashrom-0.9.7.tar.bz2" -sha512sums="a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e flashrom-0.9.7.tar.bz2" +md5sums="d239bafa1b46619d851f70f84a5b122a flashrom-0.9.7.tar.bz2 +74129051d7f4df2c376ce7b4326f4ab8 spi-ioctl.patch" +sha256sums="5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9 flashrom-0.9.7.tar.bz2 +159aa529b3791b6d888dc804a6d36a1f92646898a347bfd6887787cb425baa2e spi-ioctl.patch" +sha512sums="a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e flashrom-0.9.7.tar.bz2 +e4e6ca6b1da633e01be8e91565867c52307e00c1bd90f8fc303745f8837ca8bbb7f9cad1d436eec52c11b28e380702c7871623a1e69274d745eb806dbb21add4 spi-ioctl.patch" diff --git a/main/flashrom/spi-ioctl.patch b/main/flashrom/spi-ioctl.patch new file mode 100644 index 0000000000..235f2d508f --- /dev/null +++ b/main/flashrom/spi-ioctl.patch @@ -0,0 +1,33 @@ +--- flashrom-0.9.7.orig/linux_spi.c ++++ flashrom-0.9.7/linux_spi.c +@@ -26,6 +26,7 @@ + #include <errno.h> + #include <ctype.h> + #include <unistd.h> ++#include <asm/ioctl.h> + #include <linux/types.h> + #include <linux/spi/spidev.h> + #include <sys/ioctl.h> +--- flashrom-0.9.7.orig/linux_spi.c ++++ flashrom-0.9.7/linux_spi.c +@@ -22,7 +22,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <errno.h> + #include <ctype.h> + #include <unistd.h> +--- flashrom-0.9.7.orig/hwaccess.h ++++ flashrom-0.9.7/hwaccess.h +@@ -25,9 +25,7 @@ + #define __HWACCESS_H__ 1 + + #if defined (__i386__) || defined (__x86_64__) +-#if defined(__GLIBC__) + #include <sys/io.h> +-#endif + #endif + + #if NEED_PCI == 1 |