Change Details
plplot/Makefile |
28 | 28 | |
29 | 29 | CMAKE_HOST_FLAGS=-DCMAKE_INSTALL_PREFIX=/usr \ |
30 | 30 | -DDEFAULT_NO_DEVICES=ON \ |
31 | | -DPKG_CONFIG_EXECUTABLE=Not-Found -DDEFAULT_NO_BINDINGS=ON |
| 31 | -DPKG_CONFIG_EXECUTABLE=Not-Found -DDEFAULT_NO_BINDINGS=ON \ |
| 32 | -DCMAKE_EXE_LINKER_FLAGS=-lm |
32 | 33 | |
33 | 34 | ## Need host-compiled plplot build dir for cmake to work for the target |
34 | 35 | define Host/Configure |
... | ... | |
44 | 45 | |
45 | 46 | define Host/Compile |
46 | 47 | $(if $(CONFIG_PACKAGE_plplot-octave),$(Host/Compile/Octave),) |
47 | | $(MAKE) -C $(HOST_BUILD_DIR)/build_dir VERBOSE=1 -j4 |
| 48 | $(MAKE) -C $(HOST_BUILD_DIR)/build_dir VERBOSE=1 -j4 |
48 | 49 | endef |
49 | 50 | |
50 | 51 | define Host/Install/Octave |
plplot/patches/009-fix-libm.patch |
| 1 | Index: plplot-5.9.7/cmake/modules/plplot.cmake |
| 2 | =================================================================== |
| 3 | --- plplot-5.9.7.orig/cmake/modules/plplot.cmake 2011-05-26 20:55:13.000000000 +0200 |
| 4 | @@ -481,9 +481,9 @@ |
| 5 | # On windows systems the math library is not separated so do not specify |
| 6 | # it unless you are on a non-windows system. |
| 7 | if(NOT WIN32) |
| 8 | - find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib) |
| 9 | + find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib /lib) |
| 10 | if(NOT MATH_LIB) |
| 11 | - message(FATAL_ERROR "Cannot find required math library") |
| 12 | + message("Cannot find required math library, continuing anyway") |
| 13 | endif(NOT MATH_LIB) |
| 14 | endif(NOT WIN32) |
| 15 | # Must come after MATH_LIB is defined (or not). |
plplot/patches/070-disable-pango.patch |
1 | 1 | Index: plplot-5.9.7/cmake/modules/plplot.cmake |
2 | 2 | =================================================================== |
3 | | +++ plplot-5.9.7/cmake/modules/plplot.cmake 2011-02-15 22:32:09.000000000 +0100 |
| 3 | --- plplot-5.9.7.orig/cmake/modules/plplot.cmake 2011-05-26 20:25:37.000000000 +0200 |
4 | 4 | @@ -493,7 +493,8 @@ |
5 | 5 | # ======================================================================= |
6 | 6 | # libpango support |
Download the corresponding diff file