From 0a568c8b0baae1b78d9d774ba044fb0cea3a9b90 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 31 Aug 2019 11:21:16 +0000 Subject: [PATCH] Mark CONFLICTS_INSTALL between science/eccodes and science/grib_api PR: 235602 Submitted by: Robert Kruus --- science/eccodes/Makefile | 2 ++ science/grib_api/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/science/eccodes/Makefile b/science/eccodes/Makefile index 15d6712163bd..f041e9e158f0 100644 --- a/science/eccodes/Makefile +++ b/science/eccodes/Makefile @@ -17,6 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libnetcdf.so:science/netcdf \ libpng.so:graphics/png +CONFLICTS_INSTALL= grib_api + OPTIONS_DEFINE= AEC OPTIONS_SINGLE= JPEG OPTIONS_SINGLE_JPEG= JASPER OPENJPEG diff --git a/science/grib_api/Makefile b/science/grib_api/Makefile index aeaa97a5a2c6..21b2a9d5ed2c 100644 --- a/science/grib_api/Makefile +++ b/science/grib_api/Makefile @@ -18,6 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libnetcdf.so:science/netcdf \ libpng.so:graphics/png +CONFLICTS_INSTALL= eccodes + OPTIONS_SINGLE= JPEG OPTIONS_SINGLE_JPEG= JASPER OPENJPEG OPTIONS_DEFAULT=OPENJPEG