jlec 15/04/20 15:31:36
Added: plplot-5.11.0-multiarch.patch
plplot-5.11.0-ocaml.patch
plplot-5.11.0-octave.patch
Log:
Version Bump
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1 sci-libs/plplot/files/plplot-5.11.0-multiarch.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch?rev=1.1&content-type=text/plain
Index: plplot-5.11.0-multiarch.patch
===================================================================
examples/c++/Makefile.examples.in | 3 ---
examples/c/Makefile.examples.in | 2 --
examples/f95/Makefile.examples.in | 2 --
examples/tk/Makefile.examples.in | 2 --
4 files changed, 9 deletions(-)
diff --git a/examples/c++/Makefile.examples.in
b/examples/c++/Makefile.examples.in
index bb067e7..176706b 100644
--- a/examples/c++/Makefile.examples.in
+++ b/examples/c++/Makefile.examples.in
@@ -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 --git a/examples/c/Makefile.examples.in b/examples/c/Makefile.examples.in
index bc47762..56d1f49 100644
--- a/examples/c/Makefile.examples.in
+++ b/examples/c/Makefile.examples.in
@@ -25,8 +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) \
diff --git a/examples/f95/Makefile.examples.in
b/examples/f95/Makefile.examples.in
index 29631b7..32823d6 100644
--- a/examples/f95/Makefile.examples.in
+++ b/examples/f95/Makefile.examples.in
@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@
F95 = @FC@
EXEEXT = @EXEEXT@
-PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-RPATHCMD = @RPATHCMD@
EXECUTABLES_list = \
x00f$(EXEEXT) \
diff --git a/examples/tk/Makefile.examples.in b/examples/tk/Makefile.examples.in
index 98407fa..c15c94a 100644
--- a/examples/tk/Makefile.examples.in
+++ b/examples/tk/Makefile.examples.in
@@ -24,8 +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.
1.1 sci-libs/plplot/files/plplot-5.11.0-ocaml.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch?rev=1.1&content-type=text/plain
Index: plplot-5.11.0-ocaml.patch
===================================================================
bindings/ocaml/CMakeLists.txt | 4 ++--
bindings/ocaml/plcairo/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bindings/ocaml/CMakeLists.txt b/bindings/ocaml/CMakeLists.txt
index 93d073a..d31a64f 100644
--- a/bindings/ocaml/CMakeLists.txt
+++ b/bindings/ocaml/CMakeLists.txt
@@ -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 --git a/bindings/ocaml/plcairo/CMakeLists.txt
b/bindings/ocaml/plcairo/CMakeLists.txt
index c4b4a41..ce1dc92 100644
--- a/bindings/ocaml/plcairo/CMakeLists.txt
+++ b/bindings/ocaml/plcairo/CMakeLists.txt
@@ -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}
1.1 sci-libs/plplot/files/plplot-5.11.0-octave.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.11.0-octave.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.11.0-octave.patch?rev=1.1&content-type=text/plain
Index: plplot-5.11.0-octave.patch
===================================================================
plplot_test/test_octave.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plplot_test/test_octave.sh.in b/plplot_test/test_octave.sh.in
index 8a50d8b..8eb35fc 100755
--- a/plplot_test/test_octave.sh.in
+++ b/plplot_test/test_octave.sh.in
@@ -35,7 +35,7 @@ echo "$TOPDIR"
export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
# Launch an Octave script that exercises all the demos
-$octave -f -q <<EOF 2> test.error
+$octave -f -q $octaveopts -p "$octavedir" <<EOF 2> test.error
# Disable warnings about shadowed functions - PLplot is _supposed_ to shadow
the core functions
warning("off","Octave:shadowed-function");
