Revision: 26812 http://sourceforge.net/p/gar/code/26812 Author: dmichelsen Date: 2021-11-10 09:12:01 +0000 (Wed, 10 Nov 2021) Log Message: ----------- curl/trunk: Adjust dependencies
Modified Paths: -------------- csw/mgar/pkg/curl/trunk/Makefile Modified: csw/mgar/pkg/curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/curl/trunk/Makefile 2021-11-10 07:41:41 UTC (rev 26811) +++ csw/mgar/pkg/curl/trunk/Makefile 2021-11-10 09:12:01 UTC (rev 26812) @@ -55,7 +55,7 @@ RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcares2 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibrtmp0 -RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature-i386 += CSWlibintl9 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibpsl5 RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibnghttp2-14 @@ -65,6 +65,7 @@ RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibgsasl7 #RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibk5crypto3 #RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibcurl4-feature += $(RUNTIME_DEP_PKGS_CSWlibcurl4-feature-$(GARCH)) # Without the base lib the feature lib is not pulled in RUNTIME_DEP_PKGS_CSWlibcurl4-feature += CSWlibcurl4 # There is no dependency from feature to base as feature is an optional dependency @@ -97,7 +98,8 @@ # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWcurl += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWcurl-i386 += CSWlibintl9 +RUNTIME_DEP_PKGS_CSWcurl += $(RUNTIME_DEP_PKGS_CSWcurl-$(GARCH)) # Linker anomaly CHECKPKG_OVERRIDES_CSWcurl-i386 += surplus-dependency|CSWlibintl9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.