diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-23 16:01:17 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-23 16:01:17 +0200 |
| commit | 47cbc18807449ff6a9f0e71bfe137f3d070d69f7 (patch) | |
| tree | 0251ab334d42a8a58fd13d0ae9b6f7212079b1d0 /main/conky | |
| parent | 62efd50897c1854c7424c392b691911df2a61d8b (diff) | |
| download | aports-47cbc18807449ff6a9f0e71bfe137f3d070d69f7.tar.bz2 aports-47cbc18807449ff6a9f0e71bfe137f3d070d69f7.tar.xz | |
main/conky: build fix for non-existing ipv6
build server might not have ipv6 but that does not prevent us from
building it and run it on a machine with ipv6.
Diffstat (limited to 'main/conky')
| -rw-r--r-- | main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch | 27 | ||||
| -rw-r--r-- | main/conky/APKBUILD | 11 |
2 files changed, 34 insertions, 4 deletions
diff --git a/main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch b/main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch new file mode 100644 index 0000000000..66dfbfe815 --- /dev/null +++ b/main/conky/0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch @@ -0,0 +1,27 @@ +From 1a0998ff81aae523544b6f0a2afd71ea8667a5db Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 23 Jul 2015 15:58:07 +0200 +Subject: [PATCH] Change ipv6 check to warning instead of fatal error + +The compile server might not have ipv6 but that does not prevent us from +building conky and run it on a machine which has ipv6. +--- + cmake/ConkyPlatformChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake +index a2ebafc..26d0bea 100644 +--- a/cmake/ConkyPlatformChecks.cmake ++++ b/cmake/ConkyPlatformChecks.cmake +@@ -105,7 +105,7 @@ endif(BUILD_IRC) + if(BUILD_IPV6) + find_file(IF_INET6 if_inet6 PATHS /proc/net) + if(NOT IF_INET6) +- message(FATAL_ERROR "/proc/net/if_inet6 unavailable") ++ message(WARNING "/proc/net/if_inet6 unavailable") + endif(NOT IF_INET6) + endif(BUILD_IPV6) + +-- +2.4.6 + diff --git a/main/conky/APKBUILD b/main/conky/APKBUILD index 233304d50d..65d21a42aa 100644 --- a/main/conky/APKBUILD +++ b/main/conky/APKBUILD @@ -15,7 +15,7 @@ subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz musl-fixes.patch posix-awk.patch - + 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -55,10 +55,13 @@ package() { md5sums="cdc0298e5f257829d574ae8114170d9b conky-1.10.0.tar.gz 033686de05697157dbd04f08f7b7eb03 musl-fixes.patch -a2b1463fe06741f1e0707e130eb57700 posix-awk.patch" +a2b1463fe06741f1e0707e130eb57700 posix-awk.patch +9f6688a7ffe94b22ce4b30a2b493498c 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch" sha256sums="f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb conky-1.10.0.tar.gz 5f5d7b0aaed99199ccc628d482b30ccce228e15fa4f9794bf01dda9a05587691 musl-fixes.patch -c23d2df3c0250162ce16cb718fe4c87e171bc58baf29ad8898df5387888f1718 posix-awk.patch" +c23d2df3c0250162ce16cb718fe4c87e171bc58baf29ad8898df5387888f1718 posix-awk.patch +235ce40d1915a970b8962ff0cbbda71d0236cd57a8f764b9cbc63926b21bce49 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch" sha512sums="08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf conky-1.10.0.tar.gz 8753e171d143cfcd4e34187d3edbe6b1d92846319c9732931dd9addd1c9da65d88e7318dc49244db08462100cf527e1a07ddd3e005d669c551460cbfaff19ed4 musl-fixes.patch -7508ddbfa0610d54a030563bd173ec496d5a0279cab410308e15adc558416d14ff322687bd88d5a7b76d17d8d948e117993d655790a4cc6bb3650ab4ba530f9f posix-awk.patch" +7508ddbfa0610d54a030563bd173ec496d5a0279cab410308e15adc558416d14ff322687bd88d5a7b76d17d8d948e117993d655790a4cc6bb3650ab4ba530f9f posix-awk.patch +b5593dd088ac7c9351b4426b9ba55b87c819aecad5a62b48496325e0e8c1cca768559d2513cc29bf1dca273abbf6db5f80086b05016cc36a9870edc08184a002 0001-Change-ipv6-check-to-warning-instead-of-fatal-error.patch" |