From a1cd8025a09036c757bc465aed07d9ec6986e359 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Mon, 18 Aug 2025 04:53:15 +0200 Subject: [PATCH] simplify the multiarch changes --- debian/libnvtt-dev.install | 2 +- debian/libnvtt2.install | 2 +- debian/patches/01-library-versioning.patch | 2 +- debian/patches/02-multiarch.patch | 61 ---------------------- debian/patches/series | 1 - debian/rules | 3 +- 6 files changed, 4 insertions(+), 67 deletions(-) delete mode 100644 debian/patches/02-multiarch.patch diff --git a/debian/libnvtt-dev.install b/debian/libnvtt-dev.install index c2ab584..fd3ba87 100644 --- a/debian/libnvtt-dev.install +++ b/debian/libnvtt-dev.install @@ -1,2 +1,2 @@ usr/include/* -usr/lib/*/*.so +usr/lib/*.so usr/lib/${DEB_HOST_MULTIARCH}/ diff --git a/debian/libnvtt2.install b/debian/libnvtt2.install index 3de3b10..510207c 100644 --- a/debian/libnvtt2.install +++ b/debian/libnvtt2.install @@ -1 +1 @@ -usr/lib/*/*.so.* +usr/lib/*.so.* usr/lib/${DEB_HOST_MULTIARCH}/ diff --git a/debian/patches/01-library-versioning.patch b/debian/patches/01-library-versioning.patch index 9957687..dc3424a 100644 --- a/debian/patches/01-library-versioning.patch +++ b/debian/patches/01-library-versioning.patch @@ -28,7 +28,7 @@ index 0000000..d03b19d +file(READ "VERSION" VERSION) + +string(REGEX REPLACE "([0-9]).*" "\\1" MAJOR ${VERSION}) -+string(REGEX REPLACE "[0-9].([0-9]).*" "\\1"MINOR ${VERSION}) ++string(REGEX REPLACE "[0-9].([0-9]).*" "\\1" MINOR ${VERSION}) +string(REGEX REPLACE ".*([0-9])\n$" "\\1" MAINTENANCE ${VERSION}) + +set(GENERIC_LIB_VERSION "${MAJOR}.${MINOR}.${MAINTENANCE}") diff --git a/debian/patches/02-multiarch.patch b/debian/patches/02-multiarch.patch deleted file mode 100644 index ade4b7e..0000000 --- a/debian/patches/02-multiarch.patch +++ /dev/null @@ -1,61 +0,0 @@ -Title: Multiarch support -DEP: 3 -Last-Update: 2012-01-07 -Author: Lennart Weller -Forwarded: not-needed -Abstract: - Added multiarch support. This change is debian specific and - was not forwarded. - -diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt -index 50ace0f..6bb7e4d 100644 ---- a/src/nvcore/CMakeLists.txt -+++ b/src/nvcore/CMakeLists.txt -@@ -46,5 +46,5 @@ SET_TARGET_PROPERTIES(nvcore PROPERTIES - - INSTALL(TARGETS nvcore - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ LIBRARY DESTINATION ${LIB_DIR_PATH} -+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static) -diff --git a/src/nvimage/CMakeLists.txt b/src/nvimage/CMakeLists.txt -index bfcb576..b15ce65 100644 ---- a/src/nvimage/CMakeLists.txt -+++ b/src/nvimage/CMakeLists.txt -@@ -66,6 +66,6 @@ SET_TARGET_PROPERTIES(nvimage PROPERTIES - - INSTALL(TARGETS nvimage - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ LIBRARY DESTINATION ${LIB_DIR_PATH} -+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static) - -diff --git a/src/nvmath/CMakeLists.txt b/src/nvmath/CMakeLists.txt -index 5e42733..54060fb 100644 ---- a/src/nvmath/CMakeLists.txt -+++ b/src/nvmath/CMakeLists.txt -@@ -32,5 +32,5 @@ SET_TARGET_PROPERTIES(nvmath PROPERTIES - - INSTALL(TARGETS nvmath - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ LIBRARY DESTINATION ${LIB_DIR_PATH} -+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static) -diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt -index 1be4200..b676946 100644 ---- a/src/nvtt/CMakeLists.txt -+++ b/src/nvtt/CMakeLists.txt -@@ -57,8 +57,8 @@ SET_TARGET_PROPERTIES(nvtt PROPERTIES - - INSTALL(TARGETS nvtt - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib/static) -+ LIBRARY DESTINATION ${LIB_DIR_PATH} -+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static) - - INSTALL(FILES nvtt.h DESTINATION include/nvtt) - diff --git a/debian/patches/series b/debian/patches/series index 9cdd534..4dd636d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 01-library-versioning.patch -02-multiarch.patch 03-kfreebsd-bfs.patch 04-fix-gcc4.7-build.patch 05-fix-aliasing-bug.patch diff --git a/debian/rules b/debian/rules index 28ed928..5074a3f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST))) DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk CFLAGS+=$(CPPFLAGS) @@ -12,7 +11,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all dh $@ --buildsystem=cmake override_dh_auto_configure: - dh_auto_configure -- -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=Release -DLIB_DIR_PATH=lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` + dh_auto_configure -- -DNVTT_SHARED=1 override_dh_installdocs: dh_installdocs --link-doc=libnvtt2 -- 2.39.5