Mercurial > mxe-octave
view src/msvc-itstool-1.patch @ 5571:b19fb3ed330c
use cmake command line to set build shared/static options (bug #59373)
* Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable.
(build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or
BUILD_STATIC_LIBS in the toolchain file.
* armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk,
eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk,
libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk,
openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk,
suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk,
vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake
command line.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 30 Oct 2020 10:06:00 -0400 |
| parents | 90341dd4590e |
| children |
line wrap: on
line source
diff -ur itstool-1.2.0-orig/itstool.in itstool-1.2.0/itstool.in --- itstool-1.2.0-orig/itstool.in 2012-05-16 11:19:34 -0400 +++ itstool-1.2.0/itstool.in 2013-07-25 19:25:40 -0400 @@ -1,4 +1,4 @@ -#!/usr/bin/python -s +#!python -s # # Copyright (c) 2010-2011 Shaun McCance <shaunm@gnome.org> # @@ -559,9 +559,9 @@ ddir = os.getenv('XDG_DATA_DIRS', '') if ddir == '': if DATADIR not in ('/usr/local/share', '/usr/share'): - ddir += DATADIR + ':' - ddir += '/usr/local/share:/usr/share' - dirs.extend(ddir.split(':')) + ddir += DATADIR + os.pathsep + ddir += '/usr/local/share' + os.pathsep + '/usr/share' + dirs.extend(ddir.split(os.pathsep)) ddone = {} for ddir in dirs: itsdir = os.path.join(ddir, 'itstool', 'its')