openjdk8: adjust ccache check

This commit is contained in:
John Vogel 2018-03-30 03:54:15 -04:00
parent d1f631441d
commit 5c709161c9
2 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3/RCHkI4WYTw4TCnCEKnwfRhdwfHTYM0DOv3cw7qs3gRsmFRg/z8oUFx7UNqPqYqioZW43gX2OYMM17t2FrgRQY=
SHA256 (Pkgfile) = 529d17525704049747b358fbc06c72789cf5ea5963b9d4188d70db75008f3e03
RWSagIOpLGJF3+Il4jQzjRtj6Whrs5dZXfo0sweCV5/PV/AEwY1IhMqXYmuf0gu5EUP2WT3B/NkGPuBwEjDdf7dvyHcowq2+dA0=
SHA256 (Pkgfile) = 5e4d723309cca52833f3a7eb3b9ebd6baaf11c6683818baae04fce93e7ef5e4a
SHA256 (.footprint) = fd6b80c3b2a7306f2b3e85653ad0d7fdcb5062901a15c00fe393ffd6a7c36e23
SHA256 (icedtea-3.7.0.tar.xz) = bc50a4df0e9f81cb58e0e0cbd10bc7efda4f7ff11026b43d3b9ab19b91fdd827
SHA256 (corba-8u161-b12.tar.xz) = 503d75ff849219ae341f1fc2dc4dbac7c68dd4d92988d6c1f12ca502fe27aa86

View File

@ -39,7 +39,7 @@ build() {
# Use --enable-ccache instead of providing a wrapped compiler.
# NOTE: the check for usr/bin/ccache may be too specific, since it rules out
# local or opt installs.
if [ -e '/usr/bin/ccache' ] && [[ "$PATH" =~ /ccache ]]; then
if [ -e '/usr/bin/ccache' ]; then
EXTRA_OPTIONS='--enable-ccache'
PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
fi
@ -90,10 +90,10 @@ build() {
PATH=$JAVA_DIR/bin:$PATH \
make
mkdir -p $PKG/usr/lib/java/$name
cp -r openjdk.build/images/j2sdk-image/* $PKG/usr/lib/java/$name
install -d -m 0755 $PKG/usr/lib/java/$name
cp -a openjdk.build/images/j2sdk-image/* $PKG/usr/lib/java/$name
mkdir -p $PKG/etc/revdep.d
install -d -m 0755 $PKG/etc/revdep.d
echo "/usr/lib/java/$name/jre/lib/amd64" > $PKG/etc/revdep.d/$name
echo "/usr/lib/java/$name/jre/lib/amd64/jli" >> $PKG/etc/revdep.d/$name
echo "/usr/lib/java/$name/jre/lib/amd64/server" >> $PKG/etc/revdep.d/$name