use private fields in pkgconfig files

- use `Requires.private` and `Libs.private` in pkgconfig files to prevent overlinking in downstream libraries
- added `pkgconfig` as a `BuildRequires` for RPMs
- bumped required version of pkg-config to 0.18.0 everywhere I could think of
parent 724a7687
......@@ -43,7 +43,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
_pkg_min_version=m4_default([$1], [0.18.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
......
......@@ -11,7 +11,7 @@ Build-Depends: bc,
libgsl0-dev (>= 1.9) | libgsl-dev,
libhdf5-dev,
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-ligo-segments,
python-glue (>= @MIN_GLUE_VERSION@),
......
......@@ -12,6 +12,7 @@ LAL_PYTHON_PATH=@pyexecdir@
Name: LAL
Description: LSC Algorithm Library
Version: @VERSION@
Requires: gsl, fftw3, fftw3f
Libs: -L${libdir} -llal @CUDA_LIBS@ @BOINC_LIBS@ @PTHREAD_LIBS@
Requires.private: gsl, fftw3, fftw3f
Libs.private: -L${libdir} -llal @CUDA_LIBS@ @BOINC_LIBS@ @PTHREAD_LIBS@
Libs: -L${libdir} -llal
Cflags: -I${includedir} @CUDA_CFLAGS@ @BOINC_CFLAGS@ @PTHREAD_CFLAGS@
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: bc
BuildRequires: fftw-devel
BuildRequires: python2-ligo-segments
......
......@@ -12,6 +12,7 @@ LALSUPPORT_PYTHON_PATH=@pyexecdir@
Name: LALSupport
Description: LSC Algorithm Support Library (useful but non-conforming routines)
Version: @VERSION@
Requires: lal = @VERSION@
Libs: -L${libdir} -llalsupport @PTHREAD_LIBS@ @ZLIB_LIBS@
Requires.private: lal = @VERSION@
Libs.private: -L${libdir} -llalsupport @PTHREAD_LIBS@ @ZLIB_LIBS@
Libs: -L${libdir} -llalsupport
Cflags: -I${includedir} @PTHREAD_CFLAGS@ @ZLIB_CFLAGS@
......@@ -14,7 +14,7 @@ Build-Depends: bc,
libgsl-dev | libgsl0-dev (>= 1.9),
libmetaio-dev (>= 8.2),
libopenmpi-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
zlib1g-dev,
lal-dev (>= @MIN_LAL_VERSION@~),
......
......@@ -19,6 +19,7 @@ Group: LAL
Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: cfitsio-devel
BuildRequires: fftw-devel
BuildRequires: gsl-devel
......
......@@ -6,5 +6,5 @@ includedir=${prefix}/include
Name: ZLIB
Description: zlib Compression Library
Version: 1.2.3
Libs: -L${libdir} -lz
Libs.private: -L${libdir} -lz
Cflags: -I${includedir}
......@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
libgsl-dev | libgsl0-dev (>= 1.9),
libmetaio-dev (>= 8.2),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-numpy,
python3-all-dev,
......
......@@ -12,6 +12,6 @@ LALBURST_PYTHON_PATH=@pyexecdir@
Name: LALBurst
Description: LAL Burst Library Support
Version: @VERSION@
Requires: gsl, lal >= @LAL_VERSION@, libmetaio, lalmetaio >= @LALMETAIO_VERSION@, lalsimulation >= @LALSIMULATION_VERSION@
Requires.private: gsl, lal >= @LAL_VERSION@, libmetaio, lalmetaio >= @LALMETAIO_VERSION@, lalsimulation >= @LALSIMULATION_VERSION@
Libs: -L${libdir} -llalburst
Cflags: -I${includedir}
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: gsl-devel
BuildRequires: libmetaio-devel
BuildRequires: numpy
......
......@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
ldas-tools-framecpp-c-dev (>= @MIN_FRAMECPPC_VERSION@),
libframe-dev (>= 8.0),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-numpy,
python3-all-dev,
......
......@@ -12,6 +12,6 @@ LALFRAME_PYTHON_PATH=@pyexecdir@
Name: LALFrame
Description: LAL Frame Library Support
Version: @VERSION@
Requires: lal >= @LAL_VERSION@@PC_REQUIRES_FRAMEC@@PC_REQUIRES_FRAMEL@
Requires.private: lal >= @LAL_VERSION@@PC_REQUIRES_FRAMEC@@PC_REQUIRES_FRAMEL@
Libs: -L${libdir} -llalframe
Cflags: -I${includedir}
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: ldas-tools-framecpp-c-devel >= @MIN_FRAMECPPC_VERSION@
BuildRequires: libframe-devel
BuildRequires: numpy
......
......@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
libhdf5-dev,
libmetaio-dev (>= 8.2),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-astropy (>= 1.1.1),
python-h5py,
......
......@@ -12,6 +12,6 @@ LALINFERENCE_PYTHON_PATH=@pyexecdir@
Name: LALInference
Description: LAL Inference Library Support
Version: @VERSION@
Requires: gsl, lal >= @LAL_VERSION@, libmetaio, lalmetaio >= @LALMETAIO_VERSION@, lalinspiral >= @LALINSPIRAL_VERSION@, lalpulsar >= @LALPULSAR_VERSION@
Requires.private: gsl, lal >= @LAL_VERSION@, libmetaio, lalmetaio >= @LALMETAIO_VERSION@, lalinspiral >= @LALINSPIRAL_VERSION@, lalpulsar >= @LALPULSAR_VERSION@
Libs: -L${libdir} -llalinference
Cflags: -I${includedir} @OPENMP_CFLAGS@
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: chealpix-devel >= 3.30.0
BuildRequires: gsl-devel
BuildRequires: hdf5-devel
......
......@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
libgsl-dev | libgsl0-dev (>= 1.9),
libmetaio-dev (>= 8.2),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-numpy,
python3-all-dev,
......
......@@ -12,6 +12,6 @@ LALINSPIRAL_PYTHON_PATH=@pyexecdir@
Name: LALInspiral
Description: LAL Inspiral Library Support
Version: @VERSION@
Requires: gsl, lal >= @LAL_VERSION@, libmetaio, lalmetaio >= @LALMETAIO_VERSION@, lalsimulation >= @LALSIMULATION_VERSION@
Requires.private: gsl, lal >= @LAL_VERSION@, libmetaio, lalmetaio >= @LALMETAIO_VERSION@, lalsimulation >= @LALSIMULATION_VERSION@
Libs: -L${libdir} -llalinspiral
Cflags: -I${includedir}
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: gsl-devel
BuildRequires: libmetaio-devel
BuildRequires: numpy
......
......@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9),
dh-python,
libmetaio-dev (>= 8.2),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python3-all-dev,
swig (>= 3.0.7),
......
......@@ -12,6 +12,6 @@ LALMETAIO_PYTHON_PATH=@pyexecdir@
Name: LALMetaIO
Description: LAL MetaIO Library Support
Version: @VERSION@
Requires: lal >= @LAL_VERSION@, libmetaio
Requires.private: lal >= @LAL_VERSION@, libmetaio
Libs: -L${libdir} -llalmetaio
Cflags: -I${includedir}
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: libmetaio-devel
BuildRequires: numpy
BuildRequires: octave-devel
......
......@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
libfftw3-dev,
libgsl-dev | libgsl0-dev (>= 1.9),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-astropy,
python-numpy,
......
......@@ -12,6 +12,6 @@ LALPULSAR_PYTHON_PATH=@pyexecdir@
Name: LALPulsar
Description: LAL Pulsar Library
Version: @VERSION@
Requires: gsl, lal >= @LAL_VERSION@
Requires.private: gsl, lal >= @LAL_VERSION@
Libs: -L${libdir} -llalpulsar
Cflags: -I${includedir}
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: cfitsio-devel
BuildRequires: fftw-devel
BuildRequires: gsl-devel
......
......@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
help2man,
libgsl-dev | libgsl0-dev (>= 1.9),
liboctave-dev,
pkg-config,
pkg-config (>= 0.18.0),
python-all-dev,
python-numpy,
python3-all-dev,
......
......@@ -12,6 +12,6 @@ LALSIMULATION_PYTHON_PATH=@pyexecdir@
Name: LALSimulation
Description: LAL Simulation Library Support
Version: @VERSION@
Requires: lal >= @LAL_VERSION@
Requires.private: lal >= @LAL_VERSION@
Libs: -L${libdir} -llalsimulation
Cflags: -I${includedir} @OPENMP_CFLAGS@
......@@ -18,6 +18,7 @@ Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: python2-rpm-macros
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: gsl-devel
BuildRequires: numpy
BuildRequires: octave-devel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment