diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-11-14 07:46:07 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-11-14 07:46:20 +0000 |
| commit | e2fd062978df2b164fdd7b97f2c455ae2a4bf8b5 (patch) | |
| tree | 8f431d5778a7ba1268ef91e3567ffec16b7b9eb4 /main/mdadm | |
| parent | 51df01b01774921e0bdfb6cfefb2ef64131d068c (diff) | |
| download | aports-e2fd062978df2b164fdd7b97f2c455ae2a4bf8b5.tar.bz2 aports-e2fd062978df2b164fdd7b97f2c455ae2a4bf8b5.tar.xz | |
main/mdadm: remove -Werror
Adjust license, modernize
Diffstat (limited to 'main/mdadm')
| -rw-r--r-- | main/mdadm/APKBUILD | 25 | ||||
| -rw-r--r-- | main/mdadm/no-werror.patch | 13 |
2 files changed, 22 insertions, 16 deletions
diff --git a/main/mdadm/APKBUILD b/main/mdadm/APKBUILD index cce2f6ca71..a68e4a64c3 100644 --- a/main/mdadm/APKBUILD +++ b/main/mdadm/APKBUILD @@ -3,11 +3,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mdadm pkgver=4.0 -pkgrel=1 +pkgrel=2 pkgdesc="a tool for managing Linux Software RAID arrays" url="http://neil.brown.name/blog/mdadm" arch="all" -license="GPL-2.0" +license="GPL-2.0-only" depends= makedepends="groff linux-headers" subpackages="$pkgname-doc $pkgname-udev::noarch $pkgname-misc::noarch" @@ -15,19 +15,19 @@ source="https://www.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgver.ta $pkgname.initd $pkgname.confd $pkgname-raid.initd + no-werror.patch " builddir="$srcdir/$pkgname-$pkgver" build() { cd "$builddir" - CXFLAGS="-Wno-error=implicit-fallthrough" \ - make || return 1 + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 - install -Dm644 $pkgname.conf-example "$pkgdir"/etc/$pkgname.conf || return 1 + make DESTDIR="$pkgdir" install + install -Dm644 $pkgname.conf-example "$pkgdir"/etc/$pkgname.conf install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm755 "$srcdir"/$pkgname-raid.initd "$pkgdir"/etc/init.d/$pkgname-raid @@ -38,7 +38,7 @@ udev() { install_if="udev $pkgname=$pkgver-r$pkgrel" mkdir -p "$subpkgdir" - mv "$pkgdir"/lib "$subpkgdir"/ || return 1 + mv "$pkgdir"/lib "$subpkgdir"/ } misc() { @@ -50,15 +50,8 @@ misc() { install -Dm755 misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events } -md5sums="0b5c862f794dfe8952feceb8bd4f8eb2 mdadm-4.0.tar.gz -d6ac75406869e44d671c7b5c293676d7 mdadm.initd -16d2b8eb2e17184357db503470fdd8eb mdadm.confd -81b05eca507200f0759cc7481adde280 mdadm-raid.initd" -sha256sums="fa96ed39dd0c3d4451f42678768c07f70bd20670e80e68c60214a147e50a10dd mdadm-4.0.tar.gz -bd59ba77c053c4bf2b73319cdac7b734a22b8174efb8f2574825e4d2bc6fef2e mdadm.initd -9d3df571c3478aa83edb1d97231c5da5b2a8653232120df6d283605a8dfbb505 mdadm.confd -acab80b9362602b44b7a24dc645ce5a453e764b68e5eae5c376824a09e92d9cf mdadm-raid.initd" sha512sums="032218da3e2054571b52c276ada1d9b052c473ed65660c5b58d3105841d5e2e124c573b882b668fb92b512d87f94e6f3bca3b0ce0c09a92696e9cc2f86c9f1d3 mdadm-4.0.tar.gz ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4 mdadm.initd 7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9 mdadm.confd -37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd" +37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd +794d6c31fbc0a9ef2f56d7b0afdb94490f0b677414d4f2b1b5104a51c4f39948491fc21aaa30ca75c90c9f056369317f48ea2f78e04ee740327114bee5d959b4 no-werror.patch" diff --git a/main/mdadm/no-werror.patch b/main/mdadm/no-werror.patch new file mode 100644 index 0000000000..f4164c5950 --- /dev/null +++ b/main/mdadm/no-werror.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 5fd7f16..5095a42 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIB + + CC ?= $(CROSS_COMPILE)gcc + CXFLAGS ?= -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 + endif |