snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

*: source jdk profile instead of export JAVA_HOME

Browse source 
this should prevent further issues with templates not using the right
jdk path during build
This commit is contained in:
classabbyamp 2024-01-22 13:37:08 -05:00
parent 94436ad208
commit 4065fd64d5
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
12 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/apache-ant/template
View file

@ -18,16 +18,16 @@ _prefix=usr/share/apache-ant
do_configure() {
# Disable tests
sed -i 's/jars,test-jar/jars/' build.xml
export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
. /etc/profile.d/jdk.sh
./bootstrap.sh
bootstrap/bin/ant -Ddest=optional -f fetch.xml
}
do_build() {
export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
. /etc/profile.d/jdk.sh
bootstrap/bin/ant -Ddist.dir=$DESTDIR/$_prefix jars
}
do_install() {
export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
. /etc/profile.d/jdk.sh
bootstrap/bin/ant -Ddist.dir=$DESTDIR/$_prefix dist
vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d

3
srcpkgs/apache-jmeter/template
View file

@ -18,7 +18,8 @@ esac
do_build() {
# Tests fail -- they are too dependent on networking environment
JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/ ./gradlew -PchecksumIgnore -x test createDist
. /etc/profile.d/jdk.sh
./gradlew -PchecksumIgnore -x test createDist
}
do_install() {

4
srcpkgs/arduino/template
View file

@ -28,8 +28,8 @@ do_build() {
. /etc/profile.d/apache-ant.sh
. /etc/profile.d/jdk.sh
export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux"
export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include"
export CFLAGS+=" -I${XBPS_CROSS_BASE}/${JAVA_HOME}/include/linux"
export CFLAGS+=" -I${XBPS_CROSS_BASE}/${JAVA_HOME}/include"
mkdir -p build/linux/work/lib
cd ../astyle/build/gcc

2
srcpkgs/autofirma/template
View file

@ -18,7 +18,7 @@ checksum="40ebcd1200129ca08c21176a5fbd64c04ce0ac6bd932c4b213d4b7213f851a0d
make_check=no
do_build() {
export JAVA_HOME=/usr/lib/jvm/openjdk11
. /etc/profile.d/jdk.sh
cd "jmulticard-${_jmulticard_version}"
mvn clean install -Dmaven.test.skip=true
cd "../clienteafirma-${version}"

2
srcpkgs/bc-java/template
View file

@ -13,7 +13,7 @@ distfiles="https://github.com/bcgit/bc-java/archive/refs/tags/r${version/./rv}.t
checksum=09659ee93ba2143d0db9107ddf515142f1d90e03d82d3e46a16e21e9eafeba84
do_build() {
export JAVA_HOME=/usr/lib/jvm/openjdk17
. /etc/profile.d/jdk.sh
ant -f ant/jdk18+.xml clean build-provider build
}

2
srcpkgs/java-commons-lang/template
View file

@ -13,7 +13,7 @@ distfiles="https://archive.apache.org/dist/commons/lang/source/commons-lang3-${v
checksum=bc007577652f7cda7d5dc8801f218f88396ea1981cb4482679e839f5781e3b60
do_build() {
export JAVA_HOME=/usr/lib/jvm/openjdk17
. /etc/profile.d/jdk.sh
mvn -am -Dmaven.javadoc.skip=true -Dmaven.test.skip=true clean package
}

4
srcpkgs/jep/template
View file

@ -13,8 +13,8 @@ changelog="https://github.com/ninia/jep/releases"
distfiles="https://github.com/ninia/jep/archive/v${version}.tar.gz"
checksum=152894b8323a905ba98281e26406856c4197f8a42f9839d01dacd98c4a6f1bff
export JAVA_HOME=/usr/lib/jvm/openjdk17
export LDFLAGS=-L${XBPS_CROSS_BASE}/usr/lib/jvm/openjdk17/lib/server
. /etc/profile.d/jdk.sh
export LDFLAGS="-L${XBPS_CROSS_BASE}/${JAVA_HOME}/lib/server"
post_install() {
ln -sf jep.so ${DESTDIR}/${py3_sitelib}/jep/libjep.so

6
srcpkgs/libbluray/template
View file

@ -22,15 +22,15 @@ case "$XBPS_TARGET_MACHINE" in
esac
pre_build() {
export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
. /etc/profile.d/jdk.sh
}
pre_check() {
export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
. /etc/profile.d/jdk.sh
}
pre_install() {
export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
. /etc/profile.d/jdk.sh
}
libbluray-devel_package() {

2
srcpkgs/logisim-evolution/template
View file

@ -13,7 +13,7 @@ distfiles="https://github.com/logisim-evolution/logisim-evolution/archive/refs/t
checksum=7a49558a490a0df886b3ea488f12e4ea887a2ec8c278872dca39b2bebfaed3ee
do_build() {
export JAVA_HOME=/usr/lib/jvm/openjdk17
. /etc/profile.d/jdk.sh
gradle --no-daemon shadowJar
}

2
srcpkgs/mandrel/template
View file

@ -27,7 +27,7 @@ nocross=yes
do_build() {
cd mandrel-packaging-*
export PATH=/usr/libexec/chroot-git:$PATH
export JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}
. /etc/profile.d/jdk.sh
$JAVA_HOME/bin/java -ea build.java \
--mx-home $PWD/../mx-* \
--mandrel-repo $PWD/../mandrel-mandrel-* \

4
srcpkgs/pdftk-java/template
View file

@ -12,12 +12,12 @@ distfiles="https://gitlab.com/pdftk-java/pdftk/-/archive/v${version}/pdftk-v${ve
checksum=9c947de54658539e3a136e39f9c38ece1cf2893d143abb7f5bf3a2e3e005b286
do_build() {
export JAVA_HOME=/usr/lib/jvm/openjdk17
. /etc/profile.d/jdk.sh
gradle --no-daemon build
}
do_check() {
export JAVA_HOME=/usr/lib/jvm/openjdk17
. /etc/profile.d/jdk.sh
gradle --no-daemon test
}

2
srcpkgs/tuxguitar/template
View file

@ -29,7 +29,7 @@ post_extract() {
do_build() {
export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc"
export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
. /etc/profile.d/jdk.sh
for _i in . TuxGuitar-{lib,gm-utils} \
build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do
(