yade-dev team mailing list archive

["Anton Gladky" <gladky.anton@xxxxxxxxx>]

The following commit has been merged in the cmake_migration branch:
commit de60ab379e25be784490c226cc66c11833d4c427
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Thu Sep 20 21:20:57 2012 +0200

    Use multiarch.

diff --git a/debian/control b/debian/control
index a9dbe16..6afe0d0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Anton Gladky <gladky.anton@xxxxxxxxx>
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/debian-science/packages/yade.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/yade.git
-Build-Depends: debhelper (>= 9), scons, binutils-gold [amd64 i386], cmake,
+Build-Depends: debhelper (>= 9), binutils-gold [amd64 i386], cmake,
  freeglut3-dev, libboost-dev (>=1.35), libboost-date-time-dev (>=1.35), 
  libboost-filesystem-dev (>=1.35), libboost-thread-dev (>=1.35), 
  libboost-regex-dev (>=1.35), libboost-python-dev (>=1.35),
@@ -24,6 +24,8 @@ Standards-Version: 3.9.3
 
 Package: yade
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python (>= 2.7), python (<<2.8), 
  python-numpy, ipython, python-matplotlib, python-tk, python-qt4, 
diff --git a/debian/rules b/debian/rules
index b85902c..f58cc52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,14 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 export MPLCONFIGDIR := $(tmpDirMatplotLib) 
 export HOME := $(tmpDirMatplotLib) 
-export LD_LIBRARY_PATH :=  $(tmpInstall)/usr/lib/yade/py:$(tmpInstall)/usr/lib/yade:$(tmpInstall)/usr/lib/yade/py:$(tmpInstall)/usr/lib/yade/py/gts:$(tmpInstall)/usr/lib/yade/py/yade:$(tmpInstall)/usr/lib/yade/py/yade/qt:$(LD_LIBRARY_PATH); 
+export LD_LIBRARY_PATH :=  $(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/gts:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade/qt:$(LD_LIBRARY_PATH); 
 export YADE_PREFIX := $(tmpInstall)/usr
 
 extra_flags += \
 -DruntimePREFIX="/usr" \
 -DINSTALL_PREFIX="/usr" \
 -DNOSUFFIX=ON \
--DENABLE_CGAL=OFF \
+-DLIBRARY_OUTPUT_PATH=lib/$(DEB_HOST_MULTIARCH) \
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.