Hi Hez:
Can you evaluate Patch7 below that removes the -custom option
from our ocamlc build commands?
@Orion and Andrew: the rest of this response is addressed to you
as our respective Fedora and Debian packagers.
On 2015-04-25 12:42-0600 Orion Poplawski wrote:
On 04/25/2015 11:05 AM, Alan W. Irwin wrote:
While we are at it, are there any other general issues like this one
(i.e., issues likely to affect all distros) addressed by the Fedora
downstream patches which we should be aware of upstream?
There are two other issues currently addressed downstream, which I'm pretty
sure I've raised here before. The ocaml one relatively recently, not sure
about the multiarch one.
Patch2: plplot-multiarch.patch
This allows for the "core" plplot package to be "multiarch" - exactly the
same content for 32-bit and 64-bit builds. Otherwise the PKG_CONFIG_ENV and
RPATH variables have /usr/lib or /usr/lib64 in them. I know this patch isn't
acceptable upstream as it is, but if you found a way to address it, that
would be great.
Patch2a: PKG_CONFIG_ENV
I have now (commit id 2b4e397) implemented a user-configurable location called
CMAKE_INSTALL_PKG_CONFIG_DIR where the PLplot *.pc files are
installed. The default value for this cached variable is
$prefix/share/pkgconfig
which is apparently what Debian wheezy uses for multiarch *.pc files.
@Andrew: can you confirm that location for modern Debian?
@Orion: If that default location is not right for the Fedora multiarch
needs, try setting CMAKE_INSTALL_PKG_CONFIG_DIR on the cmake command
line.
Patch2b: RPATH
Use -DUSE_RPATH=OFF. This should make all rpath results empty and the
RPATH part of Patch2 redundant.
@Orion:
In sum, with commit id 2b4e397 and the long-implemented USE_RPATH there
should no longer be any need for Patch2. Please confirm that.
# Don't use -custom with ocamlc
Patch7: plplot-ocaml.patch
I have left that patch attached because I don't have any OCaml expertise
to make an informed decision about whether to accept that upstream.
Our OCaml go-to guy here was Hezekiah M. Carty so I have CC'd him in
hopes that he will make the decision.
@ Andrew:
However, Hez has not been in contact for quite a while now so if he
doesn't respond would you be willing to make the decision (since I
believe your OCaml expertise no matter how small is still greater
than my own. :-) ).
Alan
__________________________
Alan W. Irwin
Astronomical research affiliation with Department of Physics and Astronomy,
University of Victoria (astrowww.phys.uvic.ca).
Programming affiliations with the FreeEOS equation-of-state
implementation for stellar interiors (freeeos.sf.net); the Time
Ephemerides project (timeephem.sf.net); PLplot scientific plotting
software package (plplot.sf.net); the libLASi project
(unifont.org/lasi); the Loads of Linux Links project (loll.sf.net);
and the Linux Brochure Project (lbproject.sf.net).
__________________________
Linux-powered Science
__________________________
diff -up plplot-5.11.0/bindings/ocaml/CMakeLists.txt.ocaml plplot-5.11.0/bindings/ocaml/CMakeLists.txt
--- plplot-5.11.0/bindings/ocaml/CMakeLists.txt.ocaml 2015-02-06 13:43:35.261931129 -0700
+++ plplot-5.11.0/bindings/ocaml/CMakeLists.txt 2015-02-06 13:44:58.758486273 -0700
@@ -154,11 +154,11 @@ if(ENABLE_ocaml)
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
)
- # ocamlc -a -custom builds a *.cma library from *.cmo
+ # ocamlc -a builds a *.cma library from *.cmo
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/plplot.cma
- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS}
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo
${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo
diff -up plplot-5.11.0/bindings/ocaml/plcairo/CMakeLists.txt.ocaml plplot-5.11.0/bindings/ocaml/plcairo/CMakeLists.txt
--- plplot-5.11.0/bindings/ocaml/plcairo/CMakeLists.txt.ocaml 2015-02-06 13:43:35.262931124 -0700
+++ plplot-5.11.0/bindings/ocaml/plcairo/CMakeLists.txt 2015-02-06 13:44:33.990617274 -0700
@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO)
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
)
- # ocamlc -a -custom builds a *.cma library from *.cmo
+ # ocamlc -a builds a *.cma library from *.cmo
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma
- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src
+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Plplot-devel mailing list
Plplot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/plplot-devel
