From b8a801def427255587a7e519577d29d1acb91162 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Wed, 15 Dec 2021 15:50:42 +0100 Subject: Disallow multiple component files per library This converts existing users of multiple component files to the new filtering mechanism and adds a check to error in the case that someone tries to set multiple component files again. Change-Id: Ie75d6c5d1b78f446ff06faba7350715289b8d17e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sccomp/Library_solver.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sccomp/Library_solver.mk') diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 900dcbd96072..933c0f7b6e38 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -19,10 +19,12 @@ $(eval $(call gb_Library_Library,solver)) -$(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver,services))) -$(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver,services))) +$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver,services)) -$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver,services)) +$(eval $(call gb_Library_add_componentimpls,solver, \ + $(if $(ENABLE_COINMP),coinmp) \ + $(if $(ENABLE_LPSOLVE),lpsolve) \ +)) $(eval $(call gb_Library_use_sdk_api,solver)) -- cgit