Mercurial > mxe-octave
view src/nettle-1-fixes.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 | 0a747a64a790 |
children |
line wrap: on
line source
This file is part of MXE. See LICENSE.md for licensing information. From c5836bef883966beb9b5be562ef0a6d0c6048879 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 12 Apr 2015 10:07:58 +0200 Subject: [PATCH] Revert "Include private dependencies automatically in pkg-config for non-shared builds" This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413. diff --git a/hogweed.pc.in b/hogweed.pc.in index 97fb9d4..839f7d0 100644 --- a/hogweed.pc.in +++ b/hogweed.pc.in @@ -11,9 +11,8 @@ Name: Hogweed Description: Nettle low-level cryptographic library (public-key algorithms) URL: http://www.lysator.liu.se/~nisse/nettle Version: @PACKAGE_VERSION@ -Requires: @IF_NOT_SHARED@ nettle -Requires.private: @IF_SHARED@ nettle -Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ -Libs.private: @IF_SHARED@ @LIBS@ +Requires.private: nettle +Libs: -L${libdir} -lhogweed +Libs.private: @LIBS@ Cflags: -I${includedir} -- 2.5.0