[csw-devel] SF.net SVN: gar:[20996] csw/mgar/pkg/otr/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 20996
          http://gar.svn.sourceforge.net/gar/?rev=20996&view=rev
Author:   lblume
Date:     2013-05-05 12:22:40 +0000 (Sun, 05 May 2013)
Log Message:
-----------
otr/trunk: Respin without libotr2 dependency, some more cleanup

Modified Paths:
--------------
    csw/mgar/pkg/otr/trunk/Makefile

Modified: csw/mgar/pkg/otr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/otr/trunk/Makefile	2013-05-05 11:10:39 UTC (rev 20995)
+++ csw/mgar/pkg/otr/trunk/Makefile	2013-05-05 12:22:40 UTC (rev 20996)
@@ -37,18 +37,15 @@
 
 RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr5
 
-RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2
 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr5
 RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11
 
-# On sparc, the dependencies end up different
-ifeq ($(shell uname -p), sparc)
-  RUNTIME_DEP_PKGS_CSWlibotr5 += CSWlibgpg-error0
-  RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0
-endif
+# Don't know yet why but this dependency is only picked under sparc
+RUNTIME_DEP_PKGS_CSWlibotr5_sparc = CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibotr5 += $(RUNTIME_DEP_PKGS_CSWlibotr5_$(GARCH))
+RUNTIME_DEP_PKGS_CSWotr_sparc = CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWotr += $(RUNTIME_DEP_PKGS_CSWotr_$(GARCH))
 
-CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibotr2
-
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 BUILD_DEP_PKGS += CSWlibgpg-error-dev
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.