Revision: 14926
http://gar.svn.sourceforge.net/gar/?rev=14926&view=rev
Author: bonivart
Date: 2011-06-28 17:52:35 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
GeoIP/trunk: remove some overrides, add i-dep
Modified Paths:
--------------
csw/mgar/pkg/GeoIP/trunk/Makefile
Modified: csw/mgar/pkg/GeoIP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/GeoIP/trunk/Makefile 2011-06-28 17:18:54 UTC (rev 14925)
+++ csw/mgar/pkg/GeoIP/trunk/Makefile 2011-06-28 17:52:35 UTC (rev 14926)
@@ -16,22 +16,20 @@
SPKG_DESC_CSWgeoip = $(DESCRIPTION)
RUNTIME_DEP_PKGS_CSWgeoip = CSWgeolitedb CSWzlib CSWgcc4corert
-PACKAGES += CSWgeoip-dev
-CATALOGNAME_CSWgeoip-dev = geoip_dev
-SPKG_DESC_CSWgeoip-dev = GeoIP C API development support
-RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip
-PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL)
+PACKAGES += CSWgeoip-dev
+CATALOGNAME_CSWgeoip-dev = geoip_dev
+SPKG_DESC_CSWgeoip-dev = GeoIP C API development support
+RUNTIME_DEP_PKGS_CSWgeoip-dev = CSWgeoip
+INCOMPATIBLE_PKGS_CSWgeoip-dev = CSWgeoipdevel
+PKGFILES_CSWgeoip-dev = $(PKGFILES_DEVEL)
GARCOMPILER = GCC4
-#TEST_TARGET = check
+# Tests require internet connection
TEST_TARGET =
EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$
-# Do not exclude static libs (needed for devel package)
-#MERGE_EXCLUDE_STATICLIBS =
-
BUILD64 = 1
STRIP_LIBTOOL = 1
@@ -42,9 +40,4 @@
CHECKPKG_OVERRIDES_CSWgeoip +=
non-uniform-lib-versions-in-package|sonames=libGeoIP.so.1,libGeoIPUpdate.so.0
CHECKPKG_OVERRIDES_CSWgeoip += surplus-dependency|CSWgeolitedb
-# Dev package renamed, remove next time
-CHECKPKG_OVERRIDES_CSWgeoip-dev +=
file-collision|/opt/csw/include/GeoIPCity.h|CSWgeoip-dev|CSWgeoipdevel
-CHECKPKG_OVERRIDES_CSWgeoip-dev +=
file-collision|/opt/csw/include/GeoIP.h|CSWgeoip-dev|CSWgeoipdevel
-CHECKPKG_OVERRIDES_CSWgeoip-dev +=
file-collision|/opt/csw/include/GeoIPUpdate.h|CSWgeoip-dev|CSWgeoipdevel
-
include gar/category.mk
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
