diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-27 20:11:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-05-27 20:16:33 +0000 |
| commit | aec10c09c2a7181360e161d5352e49e3c3529a1c (patch) | |
| tree | ece7766b1133de50abaf31ab0d16a06224f38ab5 /main/libblockdev | |
| parent | 6c27a870339d1e86f62cbddf085199081c88138a (diff) | |
| download | aports-aec10c09c2a7181360e161d5352e49e3c3529a1c.tar.bz2 aports-aec10c09c2a7181360e161d5352e49e3c3529a1c.tar.xz | |
main/libblockdev: fix reference to glibc GLOB_ONYLDIR
On s390, the code refers to GLOB_ONLYDIR, which is glibc specific and
according to the manual, only meant as an optmization.
Replace GLOB_ONLYDIR with 0x0 to fix the build on s390x.
Diffstat (limited to 'main/libblockdev')
| -rw-r--r-- | main/libblockdev/APKBUILD | 6 | ||||
| -rw-r--r-- | main/libblockdev/fix-glibc-glob-onlydir.patch | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/main/libblockdev/APKBUILD b/main/libblockdev/APKBUILD index 1841d83034..0f28b70b63 100644 --- a/main/libblockdev/APKBUILD +++ b/main/libblockdev/APKBUILD @@ -11,7 +11,8 @@ makedepends="python3 cryptsetup-dev libbytesize-dev ndctl-dev lvm2-dev glib-dev kmod-dev parted-dev nss-dev yaml-dev coreutils eudev-dev dmraid-dev volume_key-dev bash gobject-introspection-dev" subpackages="$pkgname-dev py3-$pkgname:_py3" -source="https://github.com/storaged-project/libblockdev/releases/download/${pkgver}-1/libblockdev-${pkgver}.tar.gz" +source="https://github.com/storaged-project/libblockdev/releases/download/${pkgver}-1/libblockdev-${pkgver}.tar.gz + fix-glibc-glob-onlydir.patch" build() { ./configure \ @@ -40,4 +41,5 @@ _py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib } -sha512sums="7e6e12716e18c5e48f3b2207f132c242d99ce540f55de3b6932ac3427cb532d9074358c828d9702df71068a8454c642a4c0ff96e62a567ed1c1247c59ece432b libblockdev-2.21.tar.gz" +sha512sums="7e6e12716e18c5e48f3b2207f132c242d99ce540f55de3b6932ac3427cb532d9074358c828d9702df71068a8454c642a4c0ff96e62a567ed1c1247c59ece432b libblockdev-2.21.tar.gz +199b184b2955a49320f2d8dd71be31507f170a21652c8dbc5d2821b5a451d8252402c4a14f8c0cef6b95c8a9ae85a6f385d5b9720d2d683b3b41fe1a056fc438 fix-glibc-glob-onlydir.patch" diff --git a/main/libblockdev/fix-glibc-glob-onlydir.patch b/main/libblockdev/fix-glibc-glob-onlydir.patch new file mode 100644 index 0000000000..5be3a7bd18 --- /dev/null +++ b/main/libblockdev/fix-glibc-glob-onlydir.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/s390.c b/src/plugins/s390.c +index dcb5bc9f7b..1460166b2d 100644 +--- a/src/plugins/s390.c ++++ b/src/plugins/s390.c +@@ -973,7 +973,7 @@ gboolean bd_s390_zfcp_offline (const gchar *devno, const gchar *wwpn, const gcha + + /* gather the luns */ + pattern = g_strdup_printf ("%s/0x??????????????\?\?/0x????????????????", zfcpsysfs); +- rc = glob (pattern, GLOB_ONLYDIR, NULL, &luns); ++ rc = glob (pattern, 0x0, NULL, &luns); + if (rc == GLOB_ABORTED || rc == GLOB_NOSPACE) { + g_set_error (error, BD_S390_ERROR, BD_S390_ERROR_DEVICE, + "An error occurred trying to determine if other LUNs are still associated with WWPN %s", wwpn); |