[jblas] 01/01: fix build on powerpc

Tony Mancill tmancill at moszumanska.debian.org
Tue Jan 14 06:40:36 UTC 2014


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

tmancill pushed a commit to branch master
in repository jblas.

commit 054b566feef0c319420a4110cf3154ddcd0bbdd0
Author: tony mancill <tmancill at debian.org>
Date:   Mon Jan 13 22:36:36 2014 -0800

    fix build on powerpc
---
 debian/changelog | 8 ++++++++
 debian/rules     | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5206dcb..125d1a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jblas (1.2.3-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Tweak debian/rules for tests on powerpc.
+  * Remove ./target/ in clean target of debian/rules.
+  
+ -- tony mancill <tmancill at debian.org>  Mon, 13 Jan 2014 22:33:54 -0800
+
 jblas (1.2.3-2) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index bcf3b19..26fb6af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ DEB_VERBOSE_ALL := true
 
 clean::
 	make clean || true
+	rm -rf target
 
 debian/stamp-ant-build: debian/stamp-jblas-build
 debian/stamp-jblas-build:
@@ -33,8 +34,13 @@ debian/stamp-jblas-build:
 
 debian/stamp-ant-check:
 	# the tests need to be able to find the JNI libs
+ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
+	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc \
+               && $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
+else
 	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/$(DEB_BUILD_ARCH_CPU) \
 		&& $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
+endif
 	touch $@
 
 install/jblas::

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



More information about the pkg-java-commits mailing list