[libreoffice] 05/07: fix setsdkenv_unix.sh to work with *-linux-gnu* (as on e.g. armhf)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 2b521630df4a96d16c3c60388e25f1a45215010c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 4 18:27:09 2016 +0200
fix setsdkenv_unix.sh to work with *-linux-gnu* (as on e.g. armhf)
---
changelog | 2 ++
patches/series | 1 +
patches/setsdkenv-tripplet.diff | 13 +++++++++++++
3 files changed, 16 insertions(+)
diff --git a/changelog b/changelog
index e8c4c44..6addf4b 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
not .so
* debian/patches/no-packagekit-per-default: disable losessioninstaller
per default and make it conditional on --enable-packagekit.
+ * debian/patches/setsdkenv-tripplet.diff: fix setsdkenv_unix.sh to work
+ with *-linux-gnu* (as on e.g. armhf)
* debian/control*in: add loads of ${misc:Pre-Depends} to packages having
.maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
diff --git a/patches/series b/patches/series
index 11fca58..676c85e 100644
--- a/patches/series
+++ b/patches/series
@@ -35,3 +35,4 @@ GCC-6-PR69273-workaround.diff
bash-completion-dir.diff
OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
+setsdkenv-tripplet.diff
diff --git a/patches/setsdkenv-tripplet.diff b/patches/setsdkenv-tripplet.diff
new file mode 100644
index 0000000..2385e32
--- /dev/null
+++ b/patches/setsdkenv-tripplet.diff
@@ -0,0 +1,13 @@
+diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
+index 4f9b879..1ca7249 100644
+--- a/odk/config/setsdkenv_unix.sh.in
++++ b/odk/config/setsdkenv_unix.sh.in
+@@ -154,7 +154,7 @@ case ${sdk_platform} in
+ export DYLD_LIBRARY_PATH
+ ;;
+
+- linux-gnu)
++ linux-gnu*)
+ directoryname=linux
+ comid=gcc3
+ soext=so
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: