diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-03-23 14:31:02 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-03-24 10:53:34 +0000 |
commit | a07fa9859c8a74d406f0997c10c5f5cb1d8c408f (patch) | |
tree | b222332b365de50b433ef819aaddc983b054e378 /community/openjdk7 | |
parent | 37fb155af3a796ca03778201d28649c368e11c85 (diff) | |
download | aports-a07fa9859c8a74d406f0997c10c5f5cb1d8c408f.tar.bz2 aports-a07fa9859c8a74d406f0997c10c5f5cb1d8c408f.tar.xz |
community/openjdk7: build fix
cpio moved form /bin/cpio to /usr/bin/cpio. The makefiles has the former
hardcoded.
Diffstat (limited to 'community/openjdk7')
-rw-r--r-- | community/openjdk7/APKBUILD | 4 | ||||
-rw-r--r-- | community/openjdk7/icedtea-cpio.patch | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 7a1e1d807f..f85fe41179 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -80,6 +80,7 @@ source="http://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.gz icedtea-jdk-fix-ipv6-init.patch icedtea-jdk-musl.patch icedtea-jdk-no-soname.patch + icedtea-cpio.patch " # icedtea6-1.9.7-generate_cacerts-1.patch @@ -270,4 +271,5 @@ e7a2c1771bb582d427041f8d22e48c0daf8f20d7c0926cbce3549d49c4e949359ee25a35682b486e 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb icedtea-jdk-execinfo.patch 48533f87fc2cf29d26b259be0df51087d2fe5b252e72d00c6ea2f4add7b0fb113141718c116279c5905e03f64a1118082e719393786811367cf4d472b5d36774 icedtea-jdk-fix-ipv6-init.patch 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5 icedtea-jdk-musl.patch -bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch" +bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1 icedtea-jdk-no-soname.patch +a54c79c82afa1bc95265397b274260584c8b8c6be1651ddfb907d9523a809ea4581409e0d3fb0bbb63ef5a204e8ce29b7940e78cd640af1f490ae938c59129b6 icedtea-cpio.patch" diff --git a/community/openjdk7/icedtea-cpio.patch b/community/openjdk7/icedtea-cpio.patch new file mode 100644 index 0000000000..c66c1ca60f --- /dev/null +++ b/community/openjdk7/icedtea-cpio.patch @@ -0,0 +1,11 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk +@@ -104,7 +104,7 @@ + COMM = $(UTILS_USR_BIN_PATH)comm + COMPRESS = $(UTILS_USR_BIN_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio + CUT = $(UTILS_USR_BIN_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df |