[Debian-iot-packaging] [alljoyn-core-1504] 01/01: Imported Debian patch 15.04b-2
Thorsten Alteholz
alteholz at moszumanska.debian.org
Mon May 30 18:00:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to annotated tag debian/15.04b-2
in repository alljoyn-core-1504.
commit 20a65b3822a4ce4f6d8d1a1ef3e277e31e8cd711
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Sat May 28 22:28:32 2016 +0200
Imported Debian patch 15.04b-2
---
debian/changelog | 6 +++
debian/control | 4 +-
debian/patches/more-native-cpus.patch | 15 ++++++
debian/patches/remove-build.xml | 91 +++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 19 +++++---
6 files changed, 129 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fc559a7..c99b7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+alljoyn-core-1504 (15.04b-2) unstable; urgency=medium
+
+ * Upload with patch to support more architectures
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sat, 28 May 2016 22:28:32 +0200
+
alljoyn-core-1504 (15.04b-1) unstable; urgency=medium
* Initial release (Closes: #825039)
diff --git a/debian/control b/debian/control
index c1c0804..8291db4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,14 @@ Build-Depends: dh-exec (>=0.3)
, debhelper (>=9)
, libssl-dev
, libgtest-dev
- , javahelper
, junit
, libcsv-java
, libmatthew-debug-java
, libitext-java
- , ant
, scons
, libcap-dev
+# , javahelper
+# , ant
Standards-Version: 3.9.8
Homepage: https://allseenalliance.org/framework
diff --git a/debian/patches/more-native-cpus.patch b/debian/patches/more-native-cpus.patch
new file mode 100644
index 0000000..98dfb39
--- /dev/null
+++ b/debian/patches/more-native-cpus.patch
@@ -0,0 +1,15 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: add more target CPUs to allow building on Debian buildds
+Index: alljoyn-core-1504-15.04b/build_core/SConscript
+===================================================================
+--- alljoyn-core-1504-15.04b.orig/build_core/SConscript 2015-08-01 01:31:57.000000000 +0200
++++ alljoyn-core-1504-15.04b/build_core/SConscript 2016-05-27 14:42:32.000000000 +0200
+@@ -24,7 +24,7 @@
+ default_target_cpu = 'x86_64'
+ else:
+ default_target_cpu = 'x86'
+- allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt')
++ allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt', 's390x', 'arm64', 'armhf', 'i386', 'mips', 'mipsel', 'powerpc', 'powerpc64le', 'alpha', 'hppa', 'm68k', 'mips64el', 'powerpcspe', 'ppc64', 'sparc64')
+
+ default_msvc_version = None
+
diff --git a/debian/patches/remove-build.xml b/debian/patches/remove-build.xml
new file mode 100644
index 0000000..bca5469
--- /dev/null
+++ b/debian/patches/remove-build.xml
@@ -0,0 +1,91 @@
+Index: alljoyn-core-1504-15.04b/build.xml
+===================================================================
+--- alljoyn-core-1504-15.04b.orig/build.xml 2016-05-27 19:34:27.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,86 +0,0 @@
+-<project>
+- <property name="OS" value="linux" />
+- <property name="CPU" value="x86_64" />
+- <property name="VARIANT" value="debug" />
+- <property name="top" value="." />
+- <property name="alljoyn_java" value="alljoyn_java" />
+- <property name="src" value="${alljoyn_java}/src" />
+- <property name="build" value="build/${OS}/${CPU}/${VARIANT}" />
+- <property name="dist" value="${top}/${build}/dist/java" />
+- <property name="classes" value="${top}/${build}/obj/alljoyn_java/test/classes" />
+- <property name="test" value="${top}/${build}/test/java" />
+-
+- <!-- Unknown do we need android,android_donut,maemo, or darwin -->
+- <condition property="org.alljoyn.bus.address" value="unix:abstract=alljoyn">
+- <equals arg1="${OS}" arg2="linux" />
+- </condition>
+- <condition property="org.alljoyn.bus.address" value="tcp:addr=127.0.0.1,port=9956">
+- <equals arg1="${OS}" arg2="win7" />
+- </condition>
+- <condition property="org.alljoyn.bus.address" value="tcp:addr=127.0.0.1,port=9956">
+- <equals arg1="${OS}" arg2="winxp" />
+- </condition>
+- <!-- Default property value if none of the above conditions are met -->
+- <property name="org.alljoyn.bus.address" value="unix:abstract=alljoyn" />
+-
+- <!-- if we are running a x64 build then specify the StackShadowPages size.
+- ALLJOYN-1510 when using JRE 1.6.0_34 onwards SIGSEGV are seen when running
+- unit tests. Thie is directly related to a bug that was fixed in the 1.6.0_64
+- release of the JRE. The StackShadowPages were increased from 6 to 20 by
+- default on Linux computers.
+- see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7059899
+- this "fix" cause us to see the errors that this fix was supposed to address
+- this is a run time issue not a compilation issue. -->
+- <condition property="setStackShadowPages" value="-XX:StackShadowPages=6" >
+- <equals arg1="${CPU}" arg2="x86_64" />
+- </condition>
+- <!-- Default property value for setStackShadowPages -->
+- <property name="setStackShadowPages" value="-XX:StackShadowPages=3" />
+-
+- <path id="test.classpath">
+- <pathelement location="${classes}" />
+- <fileset dir="${dist}">
+- <include name="**/*.jar" />
+- </fileset>
+- </path>
+-
+- <target name="test-init">
+- <delete dir="${test}/data"/>
+- <delete dir="${test}/reports"/>
+- <mkdir dir="${test}/data"/>
+- <mkdir dir="${test}/reports"/>
+- </target>
+-
+- <target name="test" depends="test-init">
+- <junit fork="yes" printsummary="false" errorProperty="test.failed" failureProperty="test.failed">
+- <jvmarg value="-Xcheck:jni" />
+- <jvmarg value="-Xmx512m" />
+- <jvmarg value="-Dorg.alljoyn.bus.address=${org.alljoyn.bus.address}" />
+- <jvmarg value="${setStackShadowPages}" />
+- <sysproperty key="java.library.path" path="${dist}/lib"/>
+- <classpath refid="test.classpath" />
+- <formatter type="brief" usefile="false" />
+- <formatter type="xml" />
+- <batchtest todir="${test}/data" if="testcase">
+- <fileset dir="${classes}" includes="**/*${testcase}.class" />
+- </batchtest>
+- <batchtest todir="${test}/data" unless="testcase">
+- <fileset dir="${classes}" includes="**/*Test.class" />
+- </batchtest>
+- </junit>
+-
+- <junitreport todir="${test}/data">
+- <fileset dir="${test}/data">
+- <include name="TEST-*.xml"/>
+- </fileset>
+- <report format="frames" todir="${test}/reports/junit"/>
+- </junitreport>
+-
+- <fail message="Tests failed. Check log and/or reports." if="test.failed" />
+- </target>
+-
+- <target name="clean"
+- description="clean up">
+- <!-- at the moment do nothing -->
+- </target>
+-</project>
diff --git a/debian/patches/series b/debian/patches/series
index e8f670d..593d503 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ soname.patch
add-clean-target.patch
remove-bsd-source.patch
hardening.patch
+more-native-cpus.patch
+remove-build.xml
diff --git a/debian/rules b/debian/rules
index f957560..6f3568b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,16 @@ export GTEST_DIR=/usr/src/gtest
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+# mapping i386 to x86 for Alljoyn
+ifeq ($(CPU),i686)
+ export CPU = "x86"
+endif
+# we need to check the CPU and do not conflict with
+# the already existing "arm" for cross compiling
+# TODO: check whether this is ok for armel and armhf
+ifeq ($(CPU),arm)
+ export CPU = "armhf"
+endif
OS=linux
export VERSION := 15.04b
@@ -29,17 +39,13 @@ override_dh_auto_build:
# scons BINDINGS=java $(SCONS_ARGS) \
# WS=off BT=off ICE=off
+ dpkg-architecture -l
+
scons BINDINGS=c $(SCONS_ARGS) \
WS=off BT=off ICE=off
-# (cd $(OBJ_DIR)/alljoyn_c; \
-# mv liballjoyn_c.so liballjoyn.so; \
-# mv liballjoyn_c.so.$(SONAME) liballjoyn.so.$(SONAME) )
scons BINDINGS=cpp $(SCONS_ARGS) \
WS=off BT=off ICE=off
-# (cd $(OBJ_DIR)/alljoyn_core; \
-# mv liballjoyn.so liballjoyn++.so; \
-# mv liballjoyn.so.$(SONAME) liballjoyn++.so.$(SONAME) )
# not able to build js bindings yet:
# "Must specify either GECKO_BASE or CORDOVA_BASE build variable"
@@ -105,3 +111,4 @@ blubber:
rm -rf alljoyn_core/docs/pdf/*
dh_auto_clean
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-core-1504.git
More information about the Debian-iot-packaging
mailing list