From 8268a1cf4bf4a34e07cbfaec7a989d0058f76c6f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 29 Apr 2020 21:27:21 +0200 Subject: [PATCH] - added libdir patch (fix library install dir) --- dyncall-libdir.patch | 33 +++++++++++++++++++++++++++++++++ dyncall.spec | 3 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 dyncall-libdir.patch diff --git a/dyncall-libdir.patch b/dyncall-libdir.patch new file mode 100644 index 0000000..ea8f65b --- /dev/null +++ b/dyncall-libdir.patch @@ -0,0 +1,33 @@ +--- dyncall-1.1/dyncall/CMakeLists.txt.orig 2020-01-11 22:29:16.000000000 +0100 ++++ dyncall-1.1/dyncall/CMakeLists.txt 2020-04-29 21:20:03.363282806 +0200 +@@ -38,7 +38,7 @@ + dyncall_callf.c + ) + +-install(TARGETS dyncall_s ARCHIVE DESTINATION lib ) ++install(TARGETS dyncall_s ARCHIVE DESTINATION lib${LIB_SUFFIX} ) + + install(FILES + dyncall_macros.h +--- dyncall-1.1/dyncallback/CMakeLists.txt.orig 2020-01-11 22:29:16.000000000 +0100 ++++ dyncall-1.1/dyncallback/CMakeLists.txt 2020-04-29 21:20:21.934245493 +0200 +@@ -38,7 +38,7 @@ + dyncall_callback.c + ) + +-install(TARGETS dyncallback_s ARCHIVE DESTINATION lib ) ++install(TARGETS dyncallback_s ARCHIVE DESTINATION lib${LIB_SUFFIX} ) + + install(FILES + dyncall_thunk.h +--- dyncall-1.1/dynload/CMakeLists.txt.orig 2020-01-11 22:29:16.000000000 +0100 ++++ dyncall-1.1/dynload/CMakeLists.txt 2020-04-29 21:20:34.954920462 +0200 +@@ -19,7 +19,7 @@ + # + + add_library(dynload_s STATIC dynload.c dynload_syms.c) +-install(TARGETS dynload_s ARCHIVE DESTINATION lib) ++install(TARGETS dynload_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + install(FILES dynload.h DESTINATION include) + + diff --git a/dyncall.spec b/dyncall.spec index a9afc09..b35fe4c 100644 --- a/dyncall.spec +++ b/dyncall.spec @@ -12,7 +12,7 @@ Group: Libraries #Source0Download: https://dyncall.org/download Source0: https://dyncall.org/r%{version}/%{name}-%{version}.tar.gz # Source0-md5: db7dab95f721dc1c0c513a7e4ab28345 -#Patch0: %{name}-what.patch +Patch0: %{name}-libdir.patch URL: https://dyncall.org/ BuildRequires: cmake >= 2.6 %if %{with doc} @@ -60,6 +60,7 @@ Dokumentacja bibliotek dyncall. %prep %setup -q +%patch0 -p1 %build install -d build -- 2.44.0