Package: libcgal-dev
Version: 4.3-2
Severity: wishlist
Hello,
now that boost supports multiarch installations, it would be nice if
cgal did as well. I am mostly interested in testing i386 applications
but also test armhf with qemu sometimes.
What I am pasting below (based on 4.2) should not be considered a patch
ready to apply, just some ideas that seem to help but might be
completely wrong, I know little about Debian packaging. The files in
/usr/bin are just scripts so it looks like they can remain in
libcgal-dev. I removed FindCGAL.cmake, it seems useless (cmake can find
CGALConfig.cmake without it) and not multiarch-aware (it prevents cmake
from finding CGALConfig.cmake in its new location). I think the
generated config include file ends up being the same on all platforms,
so I didn't try to move it to /usr/include/$(DEB_HOST_MULTIARCH).
Otherwise I just moved stuff around.
diff -ru cgal-4.2/debian/control x/control
--- cgal-4.2/debian/control 2013-07-28 11:04:08.000000000 +0200
+++ x/control 2014-01-24 22:34:49.499706099 +0100
@@ -14,6 +14,8 @@
Package: libcgal10
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C++ library for computational geometry
CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available
@@ -39,6 +41,8 @@
Package: libcgal-qt4-10
Architecture: any
Depends: libcgal10 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: C++ library for computational geometry (support for Qt4)
CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available
@@ -64,6 +68,7 @@
Depends: libcgal10 (= ${binary:Version}), libboost-dev, libboost-thread-dev,
libboost-system-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev,
zlib1g-dev, ${misc:Depends}
+Multi-Arch: same
Description: C++ library for computational geometry (development files)
CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available
@@ -81,6 +86,7 @@
libcgal-dev, libqt4-dev, ${misc:Depends}
Replaces: libcgal-dev (<< 4.1-1)
Breaks: libcgal-dev (<< 4.1-1)
+Multi-Arch: same
Description: C++ library for computational geometry (development files,
support for Qt4)
CGAL (Computational Geometry Algorithms Library) makes the most important
of the solutions and methods developed in computational geometry available
diff -ru cgal-4.2/debian/libcgal-dev.install x/libcgal-dev.install
--- cgal-4.2/debian/libcgal-dev.install 2012-09-02 12:02:35.000000000 +0200
+++ x/libcgal-dev.install 2014-01-24 22:40:22.560054330 +0100
@@ -1,11 +1,11 @@
usr/bin/*
usr/include/*
-usr/lib/libCGAL.a
-usr/lib/libCGAL_Core.a
-usr/lib/libCGAL_ImageIO.a
-usr/lib/libCGAL.so
-usr/lib/libCGAL_Core.so
-usr/lib/libCGAL_ImageIO.so
-usr/lib/CGAL/*
-usr/share/cmake-2.8/Modules/*
+usr/lib/*/libCGAL.a
+usr/lib/*/libCGAL_Core.a
+usr/lib/*/libCGAL_ImageIO.a
+usr/lib/*/libCGAL.so
+usr/lib/*/libCGAL_Core.so
+usr/lib/*/libCGAL_ImageIO.so
+usr/lib/*/cmake/CGAL/*
usr/share/man/man1/cgal_create_cmake_script.1
diff -ru cgal-4.2/debian/libcgal-qt4-10.install x/libcgal-qt4-10.install
--- cgal-4.2/debian/libcgal-qt4-10.install 2012-09-02 11:03:57.000000000
+0200
+++ x/libcgal-qt4-10.install 2014-01-24 22:28:30.317648586 +0100
@@ -1 +1 @@
-usr/lib/libCGAL_Qt4.so.* usr/lib
+usr/lib/*/libCGAL_Qt4.so.*
diff -ru cgal-4.2/debian/libcgal-qt4-dev.install x/libcgal-qt4-dev.install
--- cgal-4.2/debian/libcgal-qt4-dev.install 2012-09-02 11:38:15.000000000
+0200
+++ x/libcgal-qt4-dev.install 2014-01-24 22:28:52.598476927 +0100
@@ -1,5 +1,5 @@
# The next entry is disabled here because it overlaps with the corresponding
# entry in libcgal-dev.install. The files are moved in debian/rules.
# usr/include/CGAL/Qt
-usr/lib/libCGAL_Qt4.a
-usr/lib/libCGAL_Qt4.so
+usr/lib/*/libCGAL_Qt4.a
+usr/lib/*/libCGAL_Qt4.so
diff -ru cgal-4.2/debian/libcgal10.install x/libcgal10.install
--- cgal-4.2/debian/libcgal10.install 2013-03-13 20:00:50.000000000 +0100
+++ x/libcgal10.install 2014-01-24 22:29:19.179460390 +0100
@@ -1,4 +1,4 @@
-usr/lib/libCGAL.so.* usr/lib
-usr/lib/libCGAL_Core.so.* usr/lib
-usr/lib/libCGAL_ImageIO.so.* usr/lib
+usr/lib/*/libCGAL.so.*
+usr/lib/*/libCGAL_Core.so.*
+usr/lib/*/libCGAL_ImageIO.so.*
usr/share/doc/cgal/changelog usr/share/doc/libcgal10
diff -ru cgal-4.2/debian/rules x/rules
--- cgal-4.2/debian/rules 2013-05-21 23:08:42.000000000 +0200
+++ x/rules 2014-01-24 22:38:54.672795619 +0100
@@ -13,6 +13,8 @@
export TESTS_IEEE_FPU_OPTION = -mieee -mfp-rounding-mode=d
endif
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
%:
dh $@
@@ -21,12 +23,16 @@
cd static && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_BUILD_TYPE=Release \
-DWITH_NTL=ON -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF
-DWITH_examples=OFF \
- -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=FALSE
+ -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=FALSE \
+ -DCGAL_INSTALL_LIB_DIR=lib/$(DEB_HOST_MULTIARCH) \
+ -DCGAL_INSTALL_CMAKE_DIR=lib/$(DEB_HOST_MULTIARCH)/cmake/CGAL
mkdir -p shared
cd shared && QTDIR= cmake .. \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_BUILD_TYPE=Release \
-DWITH_NTL=ON -DWITH_CGAL_Qt3=OFF -DWITH_demos=OFF
-DWITH_examples=OFF \
- -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=TRUE
-DCMAKE_SKIP_RPATH=TRUE
+ -DCGAL_ENABLE_PRECONFIG=OFF -DBUILD_SHARED_LIBS=TRUE
-DCMAKE_SKIP_RPATH=TRUE \
+ -DCGAL_INSTALL_LIB_DIR=lib/$(DEB_HOST_MULTIARCH) \
+ -DCGAL_INSTALL_CMAKE_DIR=lib/$(DEB_HOST_MULTIARCH)/cmake/CGAL
mkdir -p shared/demo/CGAL_ipelets
cd shared/demo/CGAL_ipelets && QTDIR= cmake ../../../demo/CGAL_ipelets \
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_BUILD_TYPE=Release \
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
armhf
powerpc
Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libcgal-dev depends on:
ii libboost-dev 1.54.0.1
ii libboost-program-options-dev 1.54.0.1
ii libboost-system-dev 1.54.0.1
ii libboost-thread-dev 1.54.0.1
ii libcgal10 4.3-2
ii libgmp-dev [libgmp10-dev] 2:5.1.3+dfsg-1
ii libmpfr-dev 3.1.2-1
ii zlib1g-dev 1:1.2.8.dfsg-1
libcgal-dev recommends no packages.
libcgal-dev suggests no packages.
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
