Share some variables in build/pack jack2

Signed-off-by: falkTX <falktx@falktx.com>

build-jack2.sh

@@ -27,11 +27,17 @@ source setup/functions.sh
 source setup/versions.sh
 
 # ---------------------------------------------------------------------------------------------------------------------
-# jack2
 
 jack2_repo="https://github.com/jackaudio/jack2.git"
 jack2_prefix="${PAWPAW_PREFIX}-jack2"
 
+if [ "${MACOS}" -eq 1 ]; then
+    jack2_extra_prefix="/usr/local"
+fi
+
+# ---------------------------------------------------------------------------------------------------------------------
+# jack2
+
 jack2_args="--prefix=${jack2_prefix}"
 # if [ "${MACOS_OLD}" -eq 1 ] || [ "${WIN64}" -eq 1 ]; then
 #     jack2_args="${jack2_args} --mixed"
@@ -46,16 +52,10 @@ if [ "${CROSS_COMPILING}" -eq 1 ]; then
     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'
-    patch_file jack2 "git" "wscript" '/-Wno-deprecated-register/d'
-fi
-
 if [ "${JACK2_VERSION}" = "git" ]; then
     if [ ! -d jack2 ]; then
         git clone --recursive "${jack2_repo}"

pack-jack2.sh

@@ -17,10 +17,6 @@ if [ -z "${target}" ]; then
     exit 1
 fi
 
-if [ -n "${2}" ]; then
-    PACKAGING_BUILD="y"
-fi
-
 # TODO check that bootstrap-jack.sh has been run
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -31,7 +27,15 @@ source setup/functions.sh
 source setup/versions.sh
 
 # ---------------------------------------------------------------------------------------------------------------------
-# final steps for packaging, if needed
+
+jack2_repo="https://github.com/jackaudio/jack2.git"
+jack2_prefix="${PAWPAW_PREFIX}-jack2"
+
+if [ "${MACOS}" -eq 1 ]; then
+    jack2_extra_prefix="/usr/local"
+fi
+
+# ---------------------------------------------------------------------------------------------------------------------
 
 if [ "${MACOS}" -eq 1 ]; then
     for f in $(ls "${jack2_prefix}${jack2_extra_prefix}/bin"/* \