File tree 3 files changed +19
-4
lines changed 3 files changed +19
-4
lines changed Original file line number Diff line number Diff line change @@ -85,6 +85,23 @@ IF(DEB_CODENAME STREQUAL "sid")
85
85
SET (DEB_PLATFORMRELEASE "debianunstable" )
86
86
ENDIF ()
87
87
88
+ # Determine multiarch library install location
89
+
90
+ execute_process (
91
+ COMMAND dpkg-architecture -q DEB_TARGET_MULTIARCH
92
+ OUTPUT_VARIABLE DEB_TARGET_MULTIARCH
93
+ OUTPUT_STRIP_TRAILING_WHITESPACE
94
+ RESULT_VARIABLE res
95
+ )
96
+
97
+ if (res)
98
+ message (FATAL_ERROR "Failed to execute dpkg-architecture" )
99
+ endif ()
100
+
101
+ set (LIB_DIR "/usr/lib/${DEB_TARGET_MULTIARCH} " )
102
+ message (STATUS "multiarch lib location: ${LIB_DIR} " )
103
+
104
+
88
105
#Follow MYSQLCLIENT_STATIC_LINKING option on packaging
89
106
if (DEFINED MYSQLCLIENT_STATIC_LINKING)
90
107
set (DEB_CMAKE_EXTRAS
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ export DH_VERBOSE=1
30
30
export CFLAGS =
31
31
export CXXFLAGS =
32
32
33
- export LIB_DIR = /usr/lib/ $( DEB_HOST_MULTIARCH )
33
+ export LIB_DIR = @LIB_DIR@
34
34
export PLUGIN_DIR = $(LIB_DIR ) /mysql/libmysqlcppconn@JDBC_ABI_VERSION_MAJOR@/plugin
35
35
36
36
export CMAKE_OPTS = \
Original file line number Diff line number Diff line change 1
1
#! /bin/sh
2
2
set -e
3
3
4
- LIBDIR=/usr/lib/` dpkg-architecture -q DEB_TARGET_MULTIARCH`
5
-
6
- cd ${LIBDIR}
4
+ cd @LIB_DIR@
7
5
8
6
# Do nothing if old name is already present
9
7
test -e libmysqlcppconn8.so.2 && return 0
You can’t perform that action at this time.
0 commit comments