SF.net SVN: gar:[23023] csw/mgar/pkg/libserf/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 23023
          http://sourceforge.net/p/gar/code/23023
Author:   dmichelsen
Date:     2014-02-14 10:25:38 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
libserf/trunk: SONAME fixed, enable 64 bit

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-02-14 09:25:42 UTC (rev 23022)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-02-14 10:25:38 UTC (rev 23023)
@@ -12,18 +12,19 @@
     operation.
 endef
 
-MASTER_SITES = http://serf.googlecode.com/files/
-DISTFILES    = $(DISTNAME).tar.bz2
+GOOGLE_PROJECT = serf
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES += $(DISTNAME).tar.bz2
 PATCHFILES  += 0001-mark-solaris-as-posix-for-scons.patch
-LICENSE      = LICENSE
-VENDOR_URL   = http://code.google.com/p/serf/
 
+LICENSE = LICENSE
+VENDOR_URL = http://code.google.com/p/serf/
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = serf
 INSTALL_SCRIPTS = serf
 TEST_SCRIPTS =
 
-# openssl-1.0 only available for sol-10
 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
@@ -31,25 +32,23 @@
 BUILD_DEP_PKGS += CSWlibapr-dev
 BUILD_DEP_PKGS += CSWlibaprutil-dev
 
-PACKAGES += CSWlibserf1-3
-CATALOGNAME_CSWlibserf1-3 = libserf1_3
-SPKG_DESC_CSWlibserf1-3 += HTTP client library built on APR, multiplexes connections, libserf-1.so.0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
+PACKAGES += CSWlibserf1-1
+SPKG_DESC_CSWlibserf1-1 += HTTP client library built on APR, multiplexes connections, libserf-1.so.1
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibserf1-1 += CSWlibz1
+# The name libserf1_3 was wrong due to false soname interpretation
+OBSOLETED_BY_CSWlibserf1-1 += CSWlibserf1-3
 
-# Yes, this is correct
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libserf-1.so
-
 PACKAGES += CSWlibserf-dev
 CATALOGNAME_CSWlibserf-dev = libserf_dev
-SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1
-# The .so belongs to the main lib as there is no SONAME magic
-PKGFILES_DEVEL_SHAREDLIBLINK =
+SPKG_DESC_CSWlibserf-dev = Development files for libserf-1.so.1
 PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-3
+RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-1
 
+BUILD64 = 1
+
 EXTRA_LIB = $(prefix)/bdb48/lib
 
 SCONS_FLAGS += APR=$(bindir)/apr-1-config
@@ -61,26 +60,22 @@
 
 # scons expands the $ISADIR variable, so we must do some more
 # escape magics to make sure it is passed as is to the linker
-SCONS_FLAGS += LINKFLAGS="$(subst $$,\\$$\\,$(LD_OPTIONS))"
+SCONS_FLAGS += LINKFLAGS="$(LDFLAGS) $(subst $$,\\$$\\,$(LD_OPTIONS))"
 
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1.3.0|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1-3-0
-
 include gar/category.mk
 
-
 build-serf:
 	(cd $(WORKSRC); \
-		scons \
-		$(SCONS_FLAGS) PREFIX="$(prefix)")
+		$(BUILD_ENV) scons \
+		$(SCONS_FLAGS) PREFIX="$(prefix)" LIBDIR="$(libdir)")
 	@$(MAKECOOKIE)
 
 install-serf:
-	mkdir -p $(DESTDIR)$(BUILD_PREFIX)
+	mkdir -p $(DESTDIR)$(prefix)
 	(cd $(WORKSRC); \
-		scons  \
+		$(INSTALL_ENV) scons  \
 		$(SCONS_FLAGS) \
-		-Q PREFIX=$(DESTDIR)$(BUILD_PREFIX) \
+		-Q PREFIX=$(DESTDIR)$(prefix) LIBDIR="$(DESTDIR)$(libdir)"\
 		install)
 	@$(MAKECOOKIE)
 

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