diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2019-05-30 10:16:56 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2019-05-30 11:50:58 +0300 |
| commit | 4f39179461ef66f69bd83fe0024e1cf27a566a1e (patch) | |
| tree | 0e914af5a25d66cfbe6055d1760255574166b303 /community/openjdk7 | |
| parent | 88bf0a62b29226b6671edcd3a569b427e5177317 (diff) | |
| download | aports-4f39179461ef66f69bd83fe0024e1cf27a566a1e.tar.bz2 aports-4f39179461ef66f69bd83fe0024e1cf27a566a1e.tar.xz | |
community/openjdk7: remove attr-dev dependency
In new attr the only needed header attr/xattr.h is removed as obsolete.
The new standard has been for a long time to use sys/xattr.h. Fix openjdk
to use this header and remove the now unneeded attr-dev dependency.
Diffstat (limited to 'community/openjdk7')
| -rw-r--r-- | community/openjdk7/APKBUILD | 11 | ||||
| -rw-r--r-- | community/openjdk7/fix-xattr-include.patch | 13 | ||||
| -rw-r--r-- | community/openjdk7/icedtea-jdk-xattr.patch | 11 |
3 files changed, 32 insertions, 3 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 6e10f94e6a..61b909110d 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -7,7 +7,7 @@ _icedteaversrc=$_icedteaver-r1 # pkgver is <JDK version>.<JDK update> # check icedtea JDK when updating pkgver=7.211.$_icedteaver -pkgrel=0 +pkgrel=1 pkgdesc="OpenJDK 7 via IcedTea" url="https://icedtea.classpath.org/" arch="all" @@ -20,7 +20,7 @@ makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev lcms2-dev libxp-dev libxtst-dev libxinerama-dev zlib-dev libxrender-dev alsa-lib-dev freetype-dev fontconfig-dev - gtk+2.0-dev krb5-dev attr-dev pcsc-lite-dev lksctp-tools-dev + gtk+2.0-dev krb5-dev pcsc-lite-dev lksctp-tools-dev libxcomposite-dev nss-static xz" install="" @@ -83,7 +83,10 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaversrc.ta icedtea-jdk-fix-ipv6-init.patch icedtea-jdk-musl.patch icedtea-jdk-no-soname.patch + icedtea-jdk-xattr.patch icedtea-cpio.patch + + fix-xattr-include.patch " # secfixes: @@ -287,4 +290,6 @@ e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch -a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch" +e703e5f68e63f130e758b3fa813872363090c08eee6a6366f4784cf6a191a90a3642ec71e016bd05e48a66ad0ae56db8b0e318b101aca5d0885af8705423b770 icedtea-jdk-xattr.patch +a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch +4c874f0e9f3f54f688a1faf64fa3734e31f139f465ce77d12aac87558764ef66055de6cfac5b60efef2833c64256136c70f3cf5dc2712de62fc5dbebe3a8fbcd fix-xattr-include.patch" diff --git a/community/openjdk7/fix-xattr-include.patch b/community/openjdk7/fix-xattr-include.patch new file mode 100644 index 0000000000..7bba754d3e --- /dev/null +++ b/community/openjdk7/fix-xattr-include.patch @@ -0,0 +1,13 @@ +--- icedtea-2.6.17.orig/acinclude.m4 2019-05-30 09:49:34.952140696 +0300 ++++ icedtea-2.6.17/acinclude.m4 2019-05-30 09:50:28.231483929 +0300 +@@ -2271,8 +2271,8 @@ + dnl Check for syscalls + AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],, + [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])]) +- AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h], +- , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])]) ++ AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h], ++ , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers or libc6-dev or use --disable-compile-against-syscalls if necessary.])]) + ENABLE_SYSCALL_COMPILATION=true + fi + AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xtrue") diff --git a/community/openjdk7/icedtea-jdk-xattr.patch b/community/openjdk7/icedtea-jdk-xattr.patch new file mode 100644 index 0000000000..4675ba2099 --- /dev/null +++ b/community/openjdk7/icedtea-jdk-xattr.patch @@ -0,0 +1,11 @@ +--- openjdk.orig/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2019-05-30 09:55:45.271164370 +0300 ++++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2019-05-30 09:56:01.000980599 +0300 +@@ -38,7 +38,7 @@ + + #ifdef COMPILE_AGAINST_SYSCALLS + #include <sys/types.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> + #else + #include <syscalls_fp.h> + #endif |