Revision: 26197
http://sourceforge.net/p/gar/code/26197
Author: dmichelsen
Date: 2017-05-10 12:46:40 +0000 (Wed, 10 May 2017)
Log Message:
-----------
harfbuzz/trunk: Adjust dependencies
Modified Paths:
--------------
csw/mgar/pkg/harfbuzz/trunk/Makefile
Modified: csw/mgar/pkg/harfbuzz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/harfbuzz/trunk/Makefile 2017-05-10 11:36:49 UTC (rev
26196)
+++ csw/mgar/pkg/harfbuzz/trunk/Makefile 2017-05-10 12:46:40 UTC (rev
26197)
@@ -24,15 +24,13 @@
PACKAGES += CSWharfbuzz
SPKG_DESC_CSWharfbuzz = $(DESCRIPTION), utilities
PKGFILES_CSWharfbuzz += $(bindir)/.*
-RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWharfbuzz_sparc += CSWlibintl9
RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibharfbuzz0
RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibcairo2
RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibgcc-s1
-# remove once ld -z ignore is resolved on sparc
-CHECKPKG_OVERRIDES_CSWharfbuzz += surplus-dependency|CSWlibfreetype6
-CHECKPKG_OVERRIDES_CSWharfbuzz += surplus-dependency|CSWlibintl8
+RUNTIME_DEP_PKGS_CSWharfbuzz += $(RUNTIME_DEP_PKGS_CSWharfbuzz_$(GARCH))
OBSOLETED_BY_CSWharfbuzz += CSWharfbuzz-bin
PACKAGES += CSWlibharfbuzz-dev
@@ -46,21 +44,17 @@
SPKG_DESC_CSWlibharfbuzz-icu0 = $(DESCRIPTION), libharfbuzz-icu.so.0
PKGFILES_CSWlibharfbuzz-icu0 = $(call pkgfiles_lib,libharfbuzz-icu.so.0)
RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibharfbuzz0
-RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibicudata51
RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibicuuc57
RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibgcc-s1
-# remove once ld -z ignore is resolved on sparc
-CHECKPKG_OVERRIDES_CSWlibharfbuzz-icu0 += surplus-dependency|CSWlibicudata51
PACKAGES += CSWlibharfbuzz0
SPKG_DESC_CSWlibharfbuzz0 = $(DESCRIPTION), libharfbuzz.so.0
PKGFILES_CSWlibharfbuzz0 = $(call pkgfiles_lib,libharfbuzz.so.0)
-RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWlibharfbuzz0_sparc += CSWlibintl9
RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibgcc-s1
-# remove once ld -z ignore is resolved on sparc
-CHECKPKG_OVERRIDES_CSWlibharfbuzz0 += surplus-dependency|CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibharfbuzz0 +=
$(RUNTIME_DEP_PKGS_CSWlibharfbuzz0_$(GARCH))
BUILD64 = 1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
