stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8287754: Update jib GNU make dependency on Windows to latest cygwin build

Browse Source 
Reviewed-by: djelinski, ihse, mikael
This commit is contained in:
Erik Joelsson 2022-10-25 12:44:23 +00:00
parent 9051dded84
commit af2de975cb
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
make/conf/jib-profiles.js
View File

@ -67,6 +67,7 @@
* input.build_osenv * input.build_osenv
* input.build_osenv_cpu * input.build_osenv_cpu
* input.build_osenv_platform * input.build_osenv_platform
* input.build_osenv_version
* *
* For more complex nested attributes, there is a method "get": * For more complex nested attributes, there is a method "get":
* *
@ -1088,9 +1089,23 @@ var getJibProfilesDependencies = function (input, common) {
pandoc_version = "2.3.1+1.0"; pandoc_version = "2.3.1+1.0";
} }
var makeBinDir = (input.build_os == "windows" var makeRevision = "4.0+1.0";
? input.get("gnumake", "install_path") + "/cygwin/bin" var makeBinSubDir = "/bin";
: input.get("gnumake", "install_path") + "/bin"); var makeModule = "gnumake-" + input.build_platform;
if (input.build_os == "windows") {
makeModule = "gnumake-" + input.build_osenv_platform;
if (input.build_osenv == "cygwin") {
var versionArray = input.build_osenv_version.split(/\./);
var majorVer = parseInt(versionArray[0]);
var minorVer = parseInt(versionArray[1]);
if (majorVer > 3 || (majorVer == 3 && minorVer >= 3)) {
makeRevision = "4.3+1.0";
} else {
makeBinSubDir = "/cygwin/bin";
}
}
}
var makeBinDir = input.get("gnumake", "install_path") + makeBinSubDir;
var dependencies = { var dependencies = {
boot_jdk: boot_jdk, boot_jdk: boot_jdk,
@ -1155,18 +1170,12 @@ var getJibProfilesDependencies = function (input, common) {
gnumake: { gnumake: {
organization: common.organization, organization: common.organization,
ext: "tar.gz", ext: "tar.gz",
revision: "4.0+1.0", revision: makeRevision,
module: makeModule,
module: (input.build_os == "windows"
? "gnumake-" + input.build_osenv_platform
: "gnumake-" + input.build_platform),
configure_args: "MAKE=" + makeBinDir + "/make", configure_args: "MAKE=" + makeBinDir + "/make",
environment: { environment: {
"MAKE": makeBinDir + "/make" "MAKE": makeBinDir + "/make"
}, },
environment_path: makeBinDir environment_path: makeBinDir
}, },