haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly reference all additional files.

Browse Source 
Not referencing them caused them to be missing from the source packages.

This also moves all files that were in different dirs under the common
additional-files dir.
This commit is contained in:
Michael Lotz
2015-12-20 18:24:53 +01:00
parent 947c7b0ce2
commit a43c394c4d
47 changed files with 80 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev-lang/openjdk/openjdk-1.8.u40_b27.recipe
View File

@@ -20,6 +20,11 @@ SOURCE_URI_7="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/jaxws#jdk8u40-b27"
SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27"
SOURCE_DIR="jdk"
ADDITIONAL_FILES="
elf.h
jexec.rdef
"
ARCHITECTURES="!x86_gcc2 ?x86"
SECONDARY_ARCHITECTURES="?x86" # circular dependency - needs fixing
@@ -120,7 +125,7 @@ BUILD()
ln -sfn $sourceDir7 jaxws
ln -sfn $sourceDir8 nashorn
cp $portDir/sources/elf.h hotspot/src/share/vm/utilities
cp $portDir/additional-files/elf.h hotspot/src/share/vm/utilities
# If ASLR is enabled, the JVM can fail to find a large enough area for
# the heap.
@@ -149,7 +154,8 @@ INSTALL()
mkdir -p $(dirname $jdkDir)
cp -a build/haiku-*/images/j2sdk-image $jdkDir
addResourcesToBinaries $portDir/sources/jexec.rdef $jdkDir/lib/jexec
addResourcesToBinaries $portDir/additional-files/jexec.rdef \
$jdkDir/lib/jexec
# set up the cacerts file
cacerts=$jdkDir/jre/lib/security/cacerts