Browse Source

Build jack with /usr/local prefix on macos

tags/v1.0
falkTX 3 years ago
parent
commit
4d6f6fe4b4
2 changed files with 19 additions and 19 deletions
  1. +14
    -14
      build-jack.sh
  2. +5
    -5
      setup/functions.sh

+ 14
- 14
build-jack.sh View File

@@ -162,13 +162,18 @@ jack2_args="--prefix=${jack2_prefix}"
# fi
if [ "${CROSS_COMPILING}" -eq 1 ]; then
if [ "${LINUX}" -eq 1 ]; then
jack2_args="${jack2_args} --platform=linux"
jack2_args+=" --platform=linux"
elif [ "${MACOS}" -eq 1 ]; then
jack2_args="${jack2_args} --platform=darwin"
jack2_args+=" --platform=darwin"
elif [ "${WIN32}" -eq 1 ]; then
jack2_args="${jack2_args} --platform=win32"
jack2_args+=" --platform=win32"
fi
fi
if [ "${MACOS}" -eq 1 ]; then
jack2_extra_prefix="/usr/local"
jack2_args+=" --prefix=${jack2_extra_prefix}"
jack2_args+=" --destdir="${jack2_prefix}""
fi

if [ "${MACOS_OLD}" -eq 1 ]; then
patch_file jack2 "git" "wscript" '/-std=gnu++11/d'
@@ -190,11 +195,11 @@ fi
build_waf jack2 "${JACK2_VERSION}" "${jack2_args}"

# remove useless dbus-specific file
rm "${PAWPAW_PREFIX}/jack2/bin/jack_control"
rm "${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/bin/jack_control"

# copy jack pkg-config file to main system, so qjackctl can find it
if [ ! -e "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc" ]; then
cp -v "${PAWPAW_PREFIX}/jack2/lib/pkgconfig/jack.pc" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"
cp -v "${PAWPAW_PREFIX}/jack2/${jack2_extra_prefix}lib/pkgconfig/jack.pc" "${PAWPAW_PREFIX}/lib/pkgconfig/jack.pc"

# patch pkg-config file for static win32 builds in regular prefix
if [ "${WIN32}" -eq 1 ]; then
@@ -223,22 +228,17 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then
build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version"
fi


if [ "${MACOS}" -eq 1 ] && [ "${CROSS_COMPILING}" -eq 0 ]; then
./jack2/macosx/generate-pkg.sh "${PAWPAW_PREFIX}/jack2"
fi

# ---------------------------------------------------------------------------------------------------------------------

if [ -n "${PACKAGING_BUILD}" ]; then
if [ "${MACOS}" -eq 1 ]; then
for f in $(ls "${PAWPAW_PREFIX}/jack2/bin"/* \
"${PAWPAW_PREFIX}/jack2/lib"/*.dylib \
"${PAWPAW_PREFIX}/jack2/lib/jack"/*); do
for f in $(ls "${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/bin"/* \
"${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/lib"/*.dylib \
"${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/lib/jack"/*); do
patch_osx_binary_libs "${f}"
done

./jack2/macosx/generate-pkg.sh "${PAWPAW_PREFIX}/jack2/"
./jack2/macosx/generate-pkg.sh "${PAWPAW_PREFIX}/jack2${jack2_extra_prefix}/"

qjackctl_app="${PAWPAW_PREFIX}/bin/qjackctl.app"
qjackctl_dir="${qjackctl_app}/Contents/MacOS"


+ 5
- 5
setup/functions.sh View File

@@ -401,7 +401,7 @@ function build_waf() {

if [ ! -f "${pkgdir}/.stamp_installed" ]; then
pushd "${pkgdir}"
${python} waf install ${WAF_ARGS} -j 1
${python} waf install ${WAF_ARGS} --prefix="${PAWPAW_PREFIX}" ${extraconfrules} -j 1
touch .stamp_installed
popd
fi
@@ -517,10 +517,10 @@ function patch_osx_binary_libs() {
idname=$(otool -D "${file}")

if otool -L "${file}" | grep -v ":" | grep -v "${idname}" | grep -q "${PAWPAW_PREFIX}"; then
install_name_tool -change "@rpath/QtCore.framework/Versions/5/QtCore" "@executable_path/QtCore" "${file}"
install_name_tool -change "@rpath/QtGui.framework/Versions/5/QtGui" "@executable_path/QtGui" "${file}"
install_name_tool -change "@rpath/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/QtWidgets" "${file}"
install_name_tool -change "@rpath/QtXml.framework/Versions/5/QtXml" "@executable_path/QtXml" "${file}"
#install_name_tool -change "@rpath/QtCore.framework/Versions/5/QtCore" "@executable_path/QtCore" "${file}"
#install_name_tool -change "@rpath/QtGui.framework/Versions/5/QtGui" "@executable_path/QtGui" "${file}"
#install_name_tool -change "@rpath/QtWidgets.framework/Versions/5/QtWidgets" "@executable_path/QtWidgets" "${file}"
#install_name_tool -change "@rpath/QtXml.framework/Versions/5/QtXml" "@executable_path/QtXml" "${file}"
install_name_tool -change "@executable_path/../Frameworks/libjack.0.dylib" "/usr/local/lib/libjack.0.dylib" "${file}"
install_name_tool -change "${PAWPAW_PREFIX}/jack2/lib/libjack.0.dylib" "/usr/local/lib/libjack.0.dylib" "${file}"
install_name_tool -change "${PAWPAW_PREFIX}/jack2/lib/libjacknet.0.dylib" "/usr/local/lib/libjacknet.0.dylib" "${file}"


Loading…
Cancel
Save