This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit fd29c1b6721391b51347de8cb158add1ae688b58
Author: Mihai Moldovan <io...@ionic.de>
Date:   Mon Jun 29 23:03:23 2015 +0200

    macbuild.sh: add Linux library file name scheme regex as a precaution.
---
 debian/changelog |    1 +
 macbuild.sh      |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f72a4c2..1135177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - macbuild.sh: add work-in-progress PulseAudio bundling. Needs to be ripped
       apart and be redone, because dylibbundler is not smart enough to handle
       our case.
+    - macbuild.sh: add Linux library file name scheme regex as a precaution.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index 7b14bb5..9e9a1f8 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -209,8 +209,13 @@ for cur_lib_or_libdir in ${PULSEAUDIO_LIBRARIES[@]}; do
                # That's a directory... more work needed here.
                typeset entry=""
                for entry in "${cur_lib_or_libdir}"/*; do
-                       typeset 
TMP_REGEX='^.*\.(so|dylib|bundle)(\.[0-9]+){0,2}$'
-                       if [[ "${entry}" =~ ${TMP_REGEX} ]]; then
+                       typeset 
TMP_REGEX='^.*\.(\.[0-9]+){0,2}(so|dylib|bundle)$'
+
+                       # This is only here should the PA build system ever 
break and create
+                       # "linux-style" library file names. Let's hope it never 
actually comes to that.
+                       typeset 
TMP_REGEX_LINUX_COMPAT='^.*\.(so|dylib|bundle)(\.[0-9]+){0,2}$'
+
+                       if [[ "${entry}" =~ ${TMP_REGEX} ]] || [[ "${entry}" =~ 
${TMP_REGEX_LINUX_COMPAT} ]]; then
                                # Filename matched the expected template.
                                PULSEAUDIO_LIBRARIES_FULL+=( 
"$(lazy_canonical_path "${cur_lib_or_libdir}/${entry}")" )
                        fi

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to