Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2020-02-25 16:07:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Tue Feb 25 16:07:27 2020 rev:60 rq:779066 version:5.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2020-02-04 19:57:03.073451010 +0100 +++ /work/SRC/openSUSE:Factory/.plplot.new.26092/plplot.changes 2020-02-25 16:07:56.280660820 +0100 @@ -1,0 +2,13 @@ +Mon Feb 24 14:17:15 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Re-enable csironn bindings for openSUSE >= 1550 as they build + again (due to fixes to qhull package). + +------------------------------------------------------------------- +Mon Feb 24 10:12:09 UTC 2020 - [email protected] + +- add conditional for OCaml bindings, they depend on camlidl +- actually fix the OCaml bindings with plplot-ocaml.patch +- use autosetup, build verbose + +------------------------------------------------------------------- New: ---- plplot-ocaml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.NB2jY7/_old 2020-02-25 16:07:57.964662430 +0100 +++ /var/tmp/diff_new_pack.NB2jY7/_new 2020-02-25 16:07:57.968662434 +0100 @@ -22,6 +22,7 @@ %define lua_version 5.3 %endif +%bcond_with ocaml_camlidl %define tk_enabled 1 # SECTION Disable octave bindings for all versions until compilation against octave 4.4 is fixed @@ -50,6 +51,7 @@ Group: Productivity/Scientific/Other URL: http://plplot.sourceforge.net/ Source0: http://download.sf.net/plplot/%{name}-%{version}.tar.gz +Patch0: plplot-ocaml.patch # PATCH-FIX-UPSTREAM plplot-5.9.9-ada-pic.patch [email protected] -- Compile Ada code with -fPIC Patch1: plplot-5.9.9-ada-pic.patch # List based on build_ada in gcc.spec @@ -65,7 +67,12 @@ BuildRequires: lapack-devel BuildRequires: libtool BuildRequires: ncurses-devel +%if %{with ocaml_camlidl} BuildRequires: ocaml +BuildRequires: ocaml-rpm-macros +BuildRequires: ocamlfind(camlidl) +BuildRequires: ocamlfind(findlib) +%endif BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-numpy-devel @@ -169,9 +176,7 @@ Group: Development/Libraries/C and C++ Requires: %{c_shlib} = %{version} Requires: %{csirocsa_shlib} = %{version} -%if 0%{?suse_version} < 1550 Requires: %{csironn_shlib} = %{version} -%endif Requires: %{qsastime_shlib} = %{version} Requires: gcc-c++ Requires: pkgconfig @@ -197,7 +202,7 @@ %preun devel /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir -%files devel +%files devel -f %{name}.filelist.ocaml %license COPYING.LIB Copyright %doc AUTHORS FAQ README README.release %{_bindir}/pltek @@ -214,11 +219,9 @@ %{_libdir}/cmake/plplot/export_cairo-release.cmake %{_libdir}/cmake/plplot/export_csirocsa.cmake %{_libdir}/cmake/plplot/export_csirocsa-release.cmake -%if 0%{?suse_version} < 1550 %{_libdir}/libcsironn.so %{_libdir}/cmake/plplot/export_csironn.cmake %{_libdir}/cmake/plplot/export_csironn-release.cmake -%endif %{_libdir}/cmake/plplot/export_mem.cmake %{_libdir}/cmake/plplot/export_mem-release.cmake %{_libdir}/cmake/plplot/export_ntk.cmake @@ -310,6 +313,11 @@ %{_datadir}/plplot%{version}/examples/test_c_interactive.sh %{_datadir}/plplot%{version}/examples/test_cxx.sh %{_datadir}/plplot%{version}/examples/test_diff.sh +%if %{with ocaml_camlidl} +%{_libdir}/pkgconfig/plplot-ocaml.pc +%{_datadir}/plplot%{version}/examples/ocaml +%{_datadir}/plplot%{version}/examples/test_ocaml.sh +%endif ########################################################################## @@ -787,7 +795,6 @@ %{_libdir}/libcsirocsa.so.* ########################################################################## -%if 0%{?suse_version} < 1550 %package -n %{csironn_shlib} ########################################################################## Summary: PLplot csironn component @@ -807,7 +814,6 @@ %files -n %{csironn_shlib} %{_libdir}/libcsironn.so.* ########################################################################## -%endif %package -n %{qsastime_shlib} ########################################################################## @@ -981,9 +987,9 @@ ########################################################################## %prep -%setup -q -%patch1 -p1 +%autosetup -p1 +%build for file in NEWS README.release do iconv -f ISO-8859-1 -t UTF-8 $file > ${file}.tmp @@ -991,7 +997,6 @@ mv ${file}.tmp $file done -%build export CFLAGS="%{optflags} -DUSE_INTERP_RESULT -fno-strict-aliasing" export CXXFLAGS="%{optflags} -fno-strict-aliasing" export FFLAGS="%{optflags}" @@ -1008,6 +1013,7 @@ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_BUILD_TYPE:STRING=Release \\\ + -DENABLE_compiler_diagnostics=ON \\\ -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \\\ -DUSE_RPATH:BOOL=OFF \\\ -DENABLE_ada:BOOL=ON \\\ @@ -1026,7 +1032,11 @@ -DENABLE_itk:BOOL=ON \\\ -DENABLE_tk:BOOL=ON \\\ %endif - -DENABLE_ocaml:BOOL=ON \\\ +%if %{with ocaml_camlidl} + -DENABLE_ocaml:BOOL=ON \ +%else + -DENABLE_ocaml:BOOL=OFF \ +%endif -DPLD_aqt:BOOL=ON \\\ -DPLD_plmeta:BOOL=OFF \\\ -DPLD_svg:BOOL=ON \\\ @@ -1039,13 +1049,19 @@ -DPLPLOT_USE_QT5:BOOL=ON \\\ .. -make %{?_smp_mflags} +make %{?_smp_mflags} VERBOSE=1 popd %install pushd builddir %make_install DESTDIR=%{buildroot} popd +> %{name}.filelist.ocaml +%if %{with ocaml_camlidl} +: creating '%{name}.files' and '%{name}.files.devel' +%ocaml_create_file_list +mv %{name}.files.devel %{name}.filelist.ocaml +%endif # Fix up tclIndex files so they are the same on all builds for file in %{buildroot}%{_datadir}/plplot%{version}/examples/*/tclIndex ++++++ plplot-ocaml.patch ++++++ --- a/bindings/ocaml/CMakeLists.txt +++ b/bindings/ocaml/CMakeLists.txt @@ -224,7 +224,7 @@ if(ENABLE_ocaml) # ocamlopt as appropriate). This failure is likely the cause # of the ldd -r errors for the ocaml examples unless they are created # with ocamlc or ocamlopt using the appropriate rpath option. - COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl ${ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o + COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} ${CAMLIDL_LIB_FILE} ${ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o @@ -249,7 +249,7 @@ if(ENABLE_ocaml) # ocamlopt as appropriate). This failure is likely the cause # of the ldd -r errors for the ocaml examples unless they are created # with ocamlc or ocamlopt using the appropriate rpath option. - COMMAND ${OCAMLMKLIB} -o installed_plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o + COMMAND ${OCAMLMKLIB} -o installed_plplot_stubs -L${CAMLIDL_LIB_DIR} ${CAMLIDL_LIB_FILE} ${installed_ocaml_LIBRARIES_FLAGS} plplot_core_stubs.o plplot_impl.o DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o @@ -330,7 +330,7 @@ if(ENABLE_ocaml) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma - COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS} + COMMAND ${OCAMLC} -a -custom -o plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${ocaml_LIBRARIES_FLAGS} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo @@ -341,7 +341,7 @@ if(ENABLE_ocaml) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cma - COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} + COMMAND ${OCAMLC} -a -custom -o installed_plplot.cma plplot_core.cmo plplot.cmo -dllib -lplplot_stubs -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${installed_ocaml_LIBRARIES_FLAGS} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo @@ -399,7 +399,7 @@ if(ENABLE_ocaml) OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmxa ${CMAKE_CURRENT_BINARY_DIR}/plplot.a - COMMAND ${OCAMLOPT} -a -o plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${ocaml_LIBRARIES_FLAGS} + COMMAND ${OCAMLOPT} -a -o plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${ocaml_LIBRARIES_FLAGS} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmx ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx @@ -411,7 +411,7 @@ if(ENABLE_ocaml) OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.cmxa ${CMAKE_CURRENT_BINARY_DIR}/installed_plplot.a - COMMAND ${OCAMLOPT} -a -o installed_plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl ${installed_ocaml_LIBRARIES_FLAGS} + COMMAND ${OCAMLOPT} -a -o installed_plplot.cmxa plplot_core.cmx plplot.cmx -ccopt -L. -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib ${CAMLIDL_LIB_FILE} ${installed_ocaml_LIBRARIES_FLAGS} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmx ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmx --- a/cmake/modules/ocaml.cmake +++ b/cmake/modules/ocaml.cmake @@ -115,17 +115,24 @@ if(ENABLE_ocaml) OUTPUT_VARIABLE CAMLIDL_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE ) - find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${CAMLIDL_LIB_PATH} ${OCAML_LIB_PATH} ) + message(STATUS "CAMLIDL_LIB_PATH = ${CAMLIDL_LIB_PATH}") + find_file(CAMLIDL_LIB_FILE libcamlidl.a libcamlidl_stubs.a PATHS ${CAMLIDL_LIB_PATH} ${OCAML_LIB_PATH} ) + get_filename_component(CAMLIDL_LIB_DIR ${CAMLIDL_LIB_FILE} DIRECTORY) + message(STATUS "CAMLIDL_LIB_FILE = ${CAMLIDL_LIB_FILE}") + message(STATUS "CAMLIDL_LIB_DIR = ${CAMLIDL_LIB_DIR}") else(OCAMLFIND) - find_path(CAMLIDL_LIB_DIR libcamlidl.a PATHS ${OCAML_LIB_PATH} ) - endif(OCAMLFIND) - if(CAMLIDL_LIB_DIR) + find_file(CAMLIDL_LIB_FILE libcamlidl.a libcamlidl_stubs.a PATHS ${OCAML_LIB_PATH} ) + get_filename_component(CAMLIDL_LIB_DIR ${CAMLIDL_LIB_FILE} DIRECTORY) + message(STATUS "CAMLIDL_LIB_FILE = ${CAMLIDL_LIB_FILE}") message(STATUS "CAMLIDL_LIB_DIR = ${CAMLIDL_LIB_DIR}") - else(CAMLIDL_LIB_DIR) + endif(OCAMLFIND) + if(CAMLIDL_LIB_FILE) + message(STATUS "CAMLIDL_LIB_FILE = ${CAMLIDL_LIB_FILE}") + else(CAMLIDL_LIB_FILE) message(STATUS "WARNING: " "The camlidl library not found. Disabling OCaml binding") set(ENABLE_ocaml OFF CACHE BOOL "Enable OCaml binding" FORCE) - endif(CAMLIDL_LIB_DIR) + endif(CAMLIDL_LIB_FILE) endif(ENABLE_ocaml) @@ -134,7 +141,7 @@ if(ENABLE_ocaml) # standard. set( OCAML_INSTALL_DIR - ${CMAKE_INSTALL_PREFIX}/lib/ocaml + ${OCAML_LIB_PATH} CACHE PATH "PLplot install location for ocaml files" ) list(APPEND INSTALL_LOCATION_VARIABLES_LIST OCAML_INSTALL_DIR)
