This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 1ec814218139f829329d938661e61a02c36e2885 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:27:19 2015 +0100 macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh. Switches the build architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). --- debian/changelog | 3 +++ macbuild.sh | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d33d91..5ad85b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -230,6 +230,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Define and implement new function 'make_boolean()' in macbuild.sh. Takes a pseudo-boolean value and outputs either 0 or 1. Use this function. - Move functions to the start of the macbuild.sh script. + - New env var/parameter UNIVERSAL in macbuild.sh. Switches the build + architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 + and x86 (UNIVERSAL=1). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index bd35460..e25caf5 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -35,12 +35,17 @@ NXPROXY="$(which nxproxy)" : ${MACOSX_DEPLOYMENT_TARGET:="10.7"} : ${DEBUG:="0"} : ${BUNDLE:="1"} +: ${UNIVERSAL:="1"} DEBUG="$(make_boolean "${DEBUG}")" BUNDLE="$(make_boolean "${BUNDLE}")" +UNIVERSAL="$(make_boolean "${UNIVERSAL}")" [ "${DEBUG}" -eq "0" ] && BUILD_MODE="release" || BUILD_MODE="debug" +BUILD_ARCH="x86_64" +[ "${UNIVERSAL}" -eq "1" ] && BUILD_ARCH="${BUILD_ARCH} x86" + SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" MATCH_NUMBERS='^[0-9]+$' @@ -67,7 +72,7 @@ lrelease "${PROJECT}" phase "Running qmake" qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ - CONFIG+="x86_64" \ + CONFIG+="${BUILD_ARCH}" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ OSX_STDLIB="${STDLIB}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git