[gluegen2] 05/07: Turned "add patch to treat Hurd and kFreeBSD as Linux" into an actual patch

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository gluegen2.

commit 1238c74bdea64ab8f35800ff14209b86852de66b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 4 11:46:45 2016 +0200

    Turned "add patch to treat Hurd and kFreeBSD as Linux" into an actual patch
---
 debian/patches/non-linux-support.diff | 16 ++++++++++++++++
 debian/patches/series                 |  1 +
 make/gluegen-cpptasks-base.xml        |  7 +------
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/patches/non-linux-support.diff b/debian/patches/non-linux-support.diff
new file mode 100644
index 0000000..6dfa9b8
--- /dev/null
+++ b/debian/patches/non-linux-support.diff
@@ -0,0 +1,16 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -292,7 +292,12 @@
+       <os name="Android" />
+     </condition>
+     <condition property="isLinux">
+-      <os name="Linux" />
++      <or>
++        <os name="Linux" />
++        <!-- treat GNU/kFreeBSD or Hurd just as Linux -->
++        <os name="GNU/kFreeBSD" />
++        <os name="GNU" />
++      </or>
+     </condition>
+     <condition property="isSolaris">
+       <os name="SunOS" />
diff --git a/debian/patches/series b/debian/patches/series
index d72a194..774b87c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ fix-arm64-build-config.diff
 tests.diff
 disable-static-linking.diff
 s390x-support.diff
+non-linux-support.diff
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 5d94045..01d6146 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -285,12 +285,7 @@
       <os name="Android" />
     </condition>
     <condition property="isLinux">
-      <or>
-        <os name="Linux" />
-        <!-- treat GNU/kFreeBSD or Hurd just as Linux -->
-        <os name="GNU/kFreeBSD" />
-        <os name="GNU" />
-      </or>
+      <os name="Linux" />
     </condition>
     <condition property="isSolaris">
       <os name="SunOS" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git