Skip to content

Commit

Permalink
Remove build step that patches APR on macOS
Browse files Browse the repository at this point in the history
Motivation:

We dont need to patch APR anymore as the new version we are using is not suffering from the original problem

Modifications:

Remove build step that patches APR on macOS

Result:

Build works again on macOS
  • Loading branch information
normanmaurer committed Sep 27, 2023
1 parent c6ee3b9 commit ce22b5e
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@
<opensslSha256>a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539</opensslSha256>
<aprHome>${project.build.directory}/apr</aprHome>
<aprSourceDir>${project.build.directory}/apr-source</aprSourceDir>
<aprPatchFile>r1871981-macos11.patch</aprPatchFile>
<aprPatchFileSha256>8754b8089d0eb53a7c4fd435c9a9300560b675a8ff2c32315a5e9303408447fe</aprPatchFileSha256>
<archBits>64</archBits>
<linkStatic>false</linkStatic>
<osxCrossCompile>false</osxCrossCompile>
Expand Down Expand Up @@ -662,25 +660,6 @@
<else>
<echo message="Building APR" />
<mkdir dir="${aprHome}" />

<!--
We need to patch APR on macOS to be able to compile it on macOS 11 as well.
Let's just re-use the same patch that homebrew is using
https://github.com/Homebrew/homebrew-core/pull/56849
This should be removed again once apr 1.7.1 was released with the fix included.
-->
<if>
<equals arg1="${os.detected.name}" arg2="osx" />
<then>
<echo message="Patching APR to make it's build scripts work on macOS 11" />
<get src="https://raw.githubusercontent.com/Homebrew/formula-patches/7e2246542543bbd3111a4ec29f801e6e4d538f88/apr/${aprPatchFile}" dest="${project.build.directory}/${aprPatchFile}" verbose="on" />
<checksum file="${project.build.directory}/${aprPatchFile}" algorithm="SHA-256" property="${aprPatchFileSha256}" verifyProperty="isEqual" />
<patch patchfile="${project.build.directory}/${aprPatchFile}" strip="0" dir="${aprSourceDir}" />
<exec executable="buildconf" failonerror="true" dir="${aprSourceDir}" resolveexecutable="true" />
</then>
</if>

<echo message="Patching APR to not link against libcrypt" />
<patch patchfile="../patches/apr_crypt.patch" strip="0" dir="${aprSourceDir}" />
<exec executable="buildconf" failonerror="true" dir="${aprSourceDir}" resolveexecutable="true" />
Expand Down

0 comments on commit ce22b5e

Please sign in to comment.