Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The patch for the zlib is not needed after 1.2.13 version #109

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

The patch for the zlib is not needed after 1.2.13 version #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions installers/linux/alpine/tar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,10 @@ task copySource(type: Exec) {
"${project.rootDir}/", buildRoot
}

/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to leave the code to apply patches in, we do use this functionality in other versions and make need it again here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we actually use it? I think we do not do it and instead always push to the repo, the one exception is JFX.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I like the solution when the source code has one version of the file, the build via make will use that file, but the build via gradle will use some other customized files.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use it in 11 https://github.com/corretto/corretto-11/tree/develop/installers/linux/alpine/tar/patches

I think there was a patch that didn't play nice on other platforms and there wasn't a nice way to have it be MUSL_AARCH64 only, but I could be wrong.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O_o

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if that patch will fail we even will not know that...

I'll postpone this change and take a look at that patch.

* Scan the patches folder for any .patch that needs
* to be applied before start building.
*/
task applyPatches() {
dependsOn copySource
doLast {
fileTree('patches').matching {
include '*.patch'
}.each { f ->
ant.patch(patchfile: f, dir: "$buildRoot", strip: 0)
}
}
}

task configureBuild(type: Exec) {

dependsOn project.configurations.compile
dependsOn applyPatches
dependsOn copySource
workingDir "$buildRoot"

// Platform specific flags
Expand Down
149 changes: 0 additions & 149 deletions installers/linux/alpine/tar/patches/zlib.patch
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions installers/linux/universal/tar/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,9 @@ task copySource(type: Exec) {
"${project.rootDir}/", buildRoot
}

/**
* Scan the patches folder for any .patch that needs
* to be applied before start building.
*/
task applyPatches() {
dependsOn copySource
doLast {
fileTree('patches').matching {
include '*.patch'
}.each { f ->
ant.patch(patchfile: f, dir: "$buildRoot", strip: 0)
}
}
}

task configureBuild(type: Exec) {
dependsOn project.configurations.compile
dependsOn applyPatches
dependsOn copySource
workingDir "$buildRoot"

// Platform specific flags
Expand Down
149 changes: 0 additions & 149 deletions installers/linux/universal/tar/patches/zlib.patch
View file
Open in desktop

This file was deleted.