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

Fix macosx runpath dynamic library issue freetype lib #216

Merged
merged 13 commits into from
Feb 6, 2018
+45 −0
Merged

Fix macosx runpath dynamic library issue freetype lib #216

Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
771aa6c
Ensuring the JVM_VARIANT variable is being populated with the value f…
neomatrix369 Oct 10, 2017
f687e4d
Merge branch 'master' of github.com:AdoptOpenJDK/openjdk-build
neomatrix369 Nov 16, 2017
9324fce
Merge branch 'master' of github.com:AdoptOpenJDK/openjdk-build
neomatrix369 Nov 22, 2017
936ee40
Merge branch 'master' of github.com:AdoptOpenJDK/openjdk-build
neomatrix369 Jan 19, 2018
09e02c5
Merge branch 'master' of github.com:AdoptOpenJDK/openjdk-build
neomatrix369 Jan 28, 2018
b5b1bfe
Merge branch 'master' of github.com:AdoptOpenJDK/openjdk-build
neomatrix369 Feb 1, 2018
d9e389a
Merge branch 'master' of github.com:AdoptOpenJDK/openjdk-build
neomatrix369 Feb 1, 2018
a51f06f
Execute the install_name_tool again libfreetype.6.dylib with its full…
neomatrix369 Feb 1, 2018
4e0a529
Added an echo related to releasing of runpath dependency of dynamic l…
neomatrix369 Feb 1, 2018
fd7caab
Moved the logic to check for the library and release it, to a more ap…
neomatrix369 Feb 1, 2018
5db055c
Applied shellcheck comments to fix bash scripts
neomatrix369 Feb 1, 2018
03518bb
Copying libfreetype.dylib.6 (incorrectly name) to libfreetype.6.dylib…
neomatrix369 Feb 6, 2018
962a0e6
Applying the previous change to copy the libfreetype dynamic library …
neomatrix369 Feb 6, 2018
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
21 changes: 21 additions & 0 deletions sbin/common-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,27 @@ checkingAndDownloadingFreeType()
else
# shellcheck disable=SC2154
echo "${good}Successfully configured OpenJDK with the FreeType library (libfreetype)!"

if [[ ${OS_KERNEL_NAME} == "darwin" ]] ; then
TARGET_DYNAMIC_LIB_DIR="${WORKING_DIR}"/"${OPENJDK_REPO_NAME}"/installedfreetype/lib/
TARGET_DYNAMIC_LIB="${TARGET_DYNAMIC_LIB_DIR}"/libfreetype.6.dylib
echo ""
echo "Listing the contents of ${TARGET_DYNAMIC_LIB_DIR} to see if the dynamic library 'libfreetype.6.dylib' has been created..."
ls "${TARGET_DYNAMIC_LIB_DIR}"

echo ""
echo "Releasing the runpath dependency of the dynamic library ${TARGET_DYNAMIC_LIB}"
set -x
install_name_tool -id @rpath/libfreetype.6.dylib "${TARGET_DYNAMIC_LIB}"
Copy link
Contributor Author

@neomatrix369 neomatrix369 Feb 5, 2018 •
edited by gdams
Loading

Choose a reason for hiding this comment

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

@mbvreddy After all the conversations on issue #202, here's our current solution, I have reverted the change to include @rpath in the parameter.

You mentioned it worked for you, could you please share your command history with us, so I can apply them here.

I have seen @smlambert's workaround, unsure if I can include them in the build script.

set +x

# shellcheck disable=SC2181
if [[ $? == 0 ]]; then
echo "Successfully released the runpath dependency of the dynamic library ${TARGET_DYNAMIC_LIB}"
else
echo "Failed to release the runpath dependency of the dynamic library ${TARGET_DYNAMIC_LIB}"
fi
fi
fi
# shellcheck disable=SC2154
echo "${normal}"
Expand Down