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

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sat May 4 10:43:14 CEST 2013


Revision: 20976
          http://gar.svn.sourceforge.net/gar/?rev=20976&view=rev
Author:   lblume
Date:     2013-05-04 08:43:13 +0000 (Sat, 04 May 2013)
Log Message:
-----------
otr/branches/libotr2/trunk: Add conditional dependencies for sparc only

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

Modified: csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile	2013-05-03 22:03:28 UTC (rev 20975)
+++ csw/mgar/pkg/otr/branches/libotr2/trunk/Makefile	2013-05-04 08:43:13 UTC (rev 20976)
@@ -36,19 +36,19 @@
 BUILD64_LIBS_ONLY = 1
 
 RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgpg-error0
 
 RUNTIME_DEP_PKGS_CSWotr-dev += CSWlibotr2
 
 RUNTIME_DEP_PKGS_CSWotr += CSWlibotr2
-RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0
 RUNTIME_DEP_PKGS_CSWotr += CSWlibgcrypt11
 
+# On sparc, the dependencies end up different
+ifeq ($(shell uname -p), sparc)
+  RUNTIME_DEP_PKGS_CSWlibotr2 += CSWlibgpg-error0
+  RUNTIME_DEP_PKGS_CSWotr += CSWlibgpg-error0
+endif
+
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 BUILD_DEP_PKGS += CSWlibgpg-error-dev
 
-# Strange issue with checkpkg makes it require those...
-CHECKPKG_OVERRIDES_CSWotr += surplus-dependency|CSWlibgpg-error0
-CHECKPKG_OVERRIDES_CSWlibotr2 += surplus-dependency|CSWlibgpg-error0
-
 include gar/category.mk

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



More information about the devel mailing list