[packages/plplot] Make ocaml bindings install multiarch-aware

baggins baggins at pld-linux.org
Thu Jul 19 13:42:40 CEST 2012


commit bf39647e95cdf65f6b3025874ceb0d33d98a86b0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jul 19 13:33:09 2012 +0200

    Make ocaml bindings install multiarch-aware

 plplot-ocamldir.patch | 22 ++++++++++++++++++++++
 plplot.spec           |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/plplot-ocamldir.patch b/plplot-ocamldir.patch
new file mode 100644
index 0000000..07575cc
--- /dev/null
+++ b/plplot-ocamldir.patch
@@ -0,0 +1,22 @@
+--- plplot-5.9.9/bindings/ocaml/CMakeLists.txt.orig	2012-07-19 13:21:54.994034873 +0200
++++ plplot-5.9.9/bindings/ocaml/CMakeLists.txt	2012-07-19 13:23:28.724031567 +0200
+@@ -40,7 +40,7 @@
+         elseif(DEP STREQUAL "qsastime")
+           set(internal_LIB_DIR "qsastime")
+         endif()
+-        set(ocaml_STATIC_FLAGS ${ocaml_STATIC_FLAGS} -cclib ${CMAKE_BINARY_DIR}/lib/${internal_LIB_DIR}/lib${DEP}.a)
++        set(ocaml_STATIC_FLAGS ${ocaml_STATIC_FLAGS} -cclib ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/${internal_LIB_DIR}/lib${DEP}.a)
+       elseif(DEP STREQUAL "general")
+         set(ocaml_STATIC_FLAGS ${ocaml_STATIC_FLAGS})
+       else()
+--- plplot-5.9.9/cmake/modules/ocaml.cmake~	2011-10-13 02:43:01.000000000 +0200
++++ plplot-5.9.9/cmake/modules/ocaml.cmake	2012-07-19 13:29:30.017352156 +0200
+@@ -130,7 +130,7 @@
+ 
+   # Installation follows the Debian ocaml policy for want of a better
+   # standard.
+-  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ocaml
++  set(OCAML_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ocaml
+     CACHE PATH "install location for ocaml files"
+     )
+ 
diff --git a/plplot.spec b/plplot.spec
index ff330ed..ad2cec0 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -32,6 +32,7 @@ Patch2:		%{name}-link.patch
 Patch3:		%{name}-cmake.patch
 Patch4:		%{name}-nofonts.patch
 Patch5:		%{name}-adadirs.patch
+Patch6:		%{name}-ocamldir.patch
 URL:		http://plplot.sourceforge.net/
 BuildRequires:	QtGui-devel
 BuildRequires:	QtSvg-devel
@@ -619,6 +620,7 @@ Biblioteka PLplot - przykłady do wiązania dla Pythona.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 mkdir build


More information about the pld-cvs-commit mailing list