Bug#956109: libcsound not installable with multi arch
tag 956109 + patch
thanks
On Tue, 7 Apr 2020 14:37:03 +0200 Guillaume Desmottes
<guillaume.desmottes@collabora.com> wrote:
[...]
Please find a patch that should fix this
Kind regards,
Laurent Bigonville
diff -Nru csound-6.13.0~dfsg/debian/control csound-6.13.0~dfsg/debian/control
--- csound-6.13.0~dfsg/debian/control 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/control 2020-04-07 19:45:52.000000000 +0200
@@ -63,6 +63,7 @@
Package: csound-data
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: data files used by the csound library
This package includes the architecture-independent data files used by
the csound library or plugins.
@@ -88,6 +89,7 @@
${shlibs:Depends}
Recommends: csound,
stk
+Multi-Arch: same
Description: main library for Csound
This package contains the library which provides most of the Csound
functionality. This library was built using 64-bit precision for the
@@ -108,11 +110,12 @@
For more information on Csound, see the csound package
Package: libcsound64-dev
-Architecture: all
+Architecture: any
Section: libdevel
Depends: libcsound64-6.0 (<< ${source:Version}.1~),
libcsound64-6.0 (>= ${source:Version}),
${misc:Depends}
+Multi-Arch: same
Description: development files for Csound
This package contains the development files needed to build programs
linking to the Csound library.
@@ -120,12 +123,13 @@
For more information on Csound, see the csound package.
Package: libcsnd-dev
-Architecture: all
+Architecture: any
Section: libdevel
Depends: libcsnd6-6.0v5 (<< ${source:Version}.1~),
libcsnd6-6.0v5 (>= ${source:Version}),
libcsound64-dev,
${misc:Depends}
+Multi-Arch: same
Suggests: liblua5.1-luacsnd
Provides: liblua5.1-luacsnd-dev
Description: development files for Csound -- C++ API
@@ -160,6 +164,7 @@
${shlibs:Depends}
Breaks: libcsnd6-6.0
Replaces: libcsnd6-6.0
+Multi-Arch: same
Description: C++ bindings for the Csound API
This is the C++ binding for the Csound API.
.
diff -Nru csound-6.13.0~dfsg/debian/libcsnd6-6.0v5.install csound-6.13.0~dfsg/debian/libcsnd6-6.0v5.install
--- csound-6.13.0~dfsg/debian/libcsnd6-6.0v5.install 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/libcsnd6-6.0v5.install 2020-04-07 19:45:52.000000000 +0200
@@ -1 +1 @@
-usr/lib/libcsnd6.so.*
+usr/lib/*/libcsnd6.so.*
diff -Nru csound-6.13.0~dfsg/debian/libcsnd-dev.install csound-6.13.0~dfsg/debian/libcsnd-dev.install
--- csound-6.13.0~dfsg/debian/libcsnd-dev.install 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/libcsnd-dev.install 2020-04-07 19:45:52.000000000 +0200
@@ -1,4 +1,4 @@
-usr/lib/libcsnd6.so
+usr/lib/*/libcsnd6.so
usr/include/csound/CppSound.hpp
usr/include/csound/CsoundFile.hpp
usr/include/csound/csound.hpp
diff -Nru csound-6.13.0~dfsg/debian/libcsound64-6.0.install csound-6.13.0~dfsg/debian/libcsound64-6.0.install
--- csound-6.13.0~dfsg/debian/libcsound64-6.0.install 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/libcsound64-6.0.install 2020-04-07 19:45:52.000000000 +0200
@@ -1,3 +1,3 @@
-usr/lib/libcsound64.so.6*
+usr/lib/*/libcsound64.so.6*
# All opcodes
-usr/lib/csound/plugins*/
+usr/lib/*/csound/plugins*/
diff -Nru csound-6.13.0~dfsg/debian/libcsound64-dev.install csound-6.13.0~dfsg/debian/libcsound64-dev.install
--- csound-6.13.0~dfsg/debian/libcsound64-dev.install 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/libcsound64-dev.install 2020-04-07 19:45:52.000000000 +0200
@@ -1,3 +1,3 @@
-usr/lib/libcsound64.so
+usr/lib/*/libcsound64.so
usr/include/csound/*.h
usr/share/cmake/Csound/FindCsound.cmake
diff -Nru csound-6.13.0~dfsg/debian/patches/multiarch.patch csound-6.13.0~dfsg/debian/patches/multiarch.patch
--- csound-6.13.0~dfsg/debian/patches/multiarch.patch 1970-01-01 01:00:00.000000000 +0100
+++ csound-6.13.0~dfsg/debian/patches/multiarch.patch 2020-04-07 19:45:52.000000000 +0200
@@ -0,0 +1,23 @@
+From 4175828ddba695d85dcc727a4586e9ae0a29d32a Mon Sep 17 00:00:00 2001
+From: Steven Yi <stevenyi@gmail.com>
+Date: Tue, 7 Apr 2020 16:43:30 -0400
+Subject: [PATCH] make LIBRARY_INSTALL_DIR overrideable on commandline [issue
+ #1310]
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6466782164..4ae83f8528 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -193,7 +193,7 @@ option(USE_LIB64 "Set to on to set installation directory for libraries to lib64
+ if(USE_LIB64)
+ set(LIBRARY_INSTALL_DIR "lib64")
+ add_definitions("-DLIB64")
+-else()
++elseif(NOT DEFINED LIBRARY_INSTALL_DIR)
+ set(LIBRARY_INSTALL_DIR "lib")
+ endif()
+ message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}")
diff -Nru csound-6.13.0~dfsg/debian/patches/series csound-6.13.0~dfsg/debian/patches/series
--- csound-6.13.0~dfsg/debian/patches/series 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/patches/series 2020-04-07 19:45:52.000000000 +0200
@@ -1,3 +1,4 @@
debian-specific/lua-link.diff
ctcsound-import-the-SOVERSIONed-library.patch
debian-specific/Opcodes-Port-py-opcodes-to-python3.patch
+multiarch.patch
diff -Nru csound-6.13.0~dfsg/debian/rules csound-6.13.0~dfsg/debian/rules
--- csound-6.13.0~dfsg/debian/rules 2020-01-16 21:05:17.000000000 +0100
+++ csound-6.13.0~dfsg/debian/rules 2020-04-07 19:45:52.000000000 +0200
@@ -39,6 +39,7 @@
-DBUILD_MULTI_CORE=ON \
-DBUILD_TESTS=ON \
-DUSE_COMPILER_OPTIMIZATIONS=OFF \
+ -DLIBRARY_INSTALL_DIR=lib/$(DEB_HOST_MULTIARCH) \
-DPYTHON_MODULE_INSTALL_DIR=/usr/lib/python$(PYVERSION)/dist-packages \
-DJAVA_MODULE_INSTALL_DIR=/usr/lib \
-DLUA_MODULE_INSTALL_DIR=/usr/lib/lua/5.1/ \
@@ -164,7 +165,7 @@
do_dh_auto_install:
dh_auto_install
# don't install the static library
- rm $(CURDIR)/debian/tmp/usr/lib/libcsound64.a
+ rm $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcsound64.a
override_dh_auto_install-indep: do_dh_auto_install
mkdir -p $(CURDIR)/debian/tmp/usr/share/csound/hrtf
Reply to: