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.
# Don't use -custom with ocamlc
Patch7: plplot-ocaml.patch
I've attached both.
--
Orion Poplawski
Technical Manager 303-415-9701 x222
NWRA/CoRA Division FAX: 303-415-9702
3380 Mitchell Lane [email protected]
Boulder, CO 80301 http://www.cora.nwra.com
diff -up plplot-5.11.0/examples/c/Makefile.examples.in.multiarch plplot-5.11.0/examples/c/Makefile.examples.in
--- plplot-5.11.0/examples/c/Makefile.examples.in.multiarch 2015-02-06 13:39:40.538189158 -0700
+++ plplot-5.11.0/examples/c/Makefile.examples.in 2015-02-06 13:40:08.976036737 -0700
@@ -25,9 +25,6 @@ SHELL = @SH_EXECUTABLE@
CC = @CC@
EXEEXT = @EXEEXT@
-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-RPATHCMD = @RPATHCMD@
-
@gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
@gcw_true@ plplotcanvas_demo$(EXEEXT) \
@gcw_true@ plplotcanvas_animation$(EXEEXT)
diff -up plplot-5.11.0/examples/c++/Makefile.examples.in.multiarch plplot-5.11.0/examples/c++/Makefile.examples.in
--- plplot-5.11.0/examples/c++/Makefile.examples.in.multiarch 2015-02-06 13:39:40.537189163 -0700
+++ plplot-5.11.0/examples/c++/Makefile.examples.in 2015-02-06 13:41:04.003741815 -0700
@@ -25,10 +25,7 @@ SHELL = @SH_EXECUTABLE@
CXX = @CXX@
EXEEXT = @EXEEXT@
-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-RPATHCMD = @RPATHCMD@
@qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@
-@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@
@wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
@wxwidgets_true@ wxPLplotDemo$(EXEEXT)
diff -up plplot-5.11.0/examples/f95/Makefile.examples.in.multiarch plplot-5.11.0/examples/f95/Makefile.examples.in
--- plplot-5.11.0/examples/f95/Makefile.examples.in.multiarch 2015-02-06 13:39:40.538189158 -0700
+++ plplot-5.11.0/examples/f95/Makefile.examples.in 2015-02-06 13:40:22.148966137 -0700
@@ -25,9 +25,6 @@ SHELL = @SH_EXECUTABLE@
F95 = @FC@
EXEEXT = @EXEEXT@
-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-RPATHCMD = @RPATHCMD@
-
EXECUTABLES_list = \
x00f$(EXEEXT) \
x01f$(EXEEXT) \
diff -up plplot-5.11.0/examples/tk/Makefile.examples.in.multiarch plplot-5.11.0/examples/tk/Makefile.examples.in
--- plplot-5.11.0/examples/tk/Makefile.examples.in.multiarch 2015-02-06 13:39:40.538189158 -0700
+++ plplot-5.11.0/examples/tk/Makefile.examples.in 2015-02-06 13:40:43.527851552 -0700
@@ -24,9 +24,6 @@ SHELL = @SH_EXECUTABLE@
CC = @CC@
EXEEXT = @EXEEXT@
-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
-
EXECUTABLES_list = xtk01$(EXEEXT)
# Second and fourth examples depend on itk.
@itk_true@itk_EXECUTABLES_list = xtk02$(EXEEXT) xtk04$(EXEEXT)
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/plplot-devel
