SF.net SVN: gar:[25310] csw/mgar/pkg/libxml2/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Oct 23 15:29:56 CEST 2015


Revision: 25310
          http://sourceforge.net/p/gar/code/25310
Author:   dmichelsen
Date:     2015-10-23 13:29:55 +0000 (Fri, 23 Oct 2015)
Log Message:
-----------
libxml2/trunk: Update to 2.9.2, enable Python 2.6/2.7 modulation

Modified Paths:
--------------
    csw/mgar/pkg/libxml2/trunk/Makefile
    csw/mgar/pkg/libxml2/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch
    csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch

Modified: csw/mgar/pkg/libxml2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml2/trunk/Makefile	2015-10-23 11:47:30 UTC (rev 25309)
+++ csw/mgar/pkg/libxml2/trunk/Makefile	2015-10-23 13:29:55 UTC (rev 25310)
@@ -3,7 +3,7 @@
 # ! There are test failures, unfortunately.
 
 NAME = libxml2
-VERSION = 2.9.1
+VERSION = 2.9.2
 GARTYPE = v2
 
 DESCRIPTION = XML Parser Library
@@ -17,10 +17,18 @@
 
 # PATCHFILES = 0001-Forcefully-disable-the-symbol-versioning.patch
 # see Bug: https://www.opencsw.org/mantis/view.php?id=5093
-PATCHFILES = 0002-fix-PyCapsulate-for-python-version-less-2.7.patch
+#PATCHFILES = 0002-fix-PyCapsulate-for-python-version-less-2.7.patch
 
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only copy-config-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
 
 # Force custom mapfile because sudo uses one and sudo uses libxml2
 LINKER_MAPS = -M "$(abspath $(WORKDIR)/map.sudo)"
@@ -29,10 +37,11 @@
 EXTRA_CPPFLAGS += -DXML_SGML_DEFAULT_CATALOG=\\\"$(sysconfdir)/sgml/catalog\\\"
 
 # We don't have 64 bit Python yet
-CONFIGURE_ARGS_32 = --with-python=$(prefix)
+CONFIGURE_ARGS_32 = --with-python=$(PYTHON)
 CONFIGURE_ARGS_64 = --without-python
 
-CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
 BUILD64_LIBS_ONLY = 1
 
@@ -42,21 +51,26 @@
 
 PACKAGES += CSWlibxml2-2
 OBSOLETED_BY_CSWlibxml2-2 = CSWlibxml2
-SPKG_DESC_CSWlibxml2-2   = XML Parser Library
+SPKG_DESC_CSWlibxml2-2 = XML Parser Library
+PKGFILES_CSWlibxml2-2 += $(call pkgfiles_lib,libxml2.so.2)
+PKGFILES_CSWlibxml2-2 += $(bindir)/xmlcatalog
+PKGFILES_CSWlibxml2-2 += $(bindir)/xmllint
+PKGFILES_CSWlibxml2-2 += $(mandir)/man1/xmlcatalog.1
+PKGFILES_CSWlibxml2-2 += $(mandir)/man1/xmllint.1
 RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWliblzma5
 RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibxml2-2 += CSWlibz1
-# The catch-all package.
 
 PACKAGES += CSWlibxml2-dev
 OBSOLETED_BY_CSWlibxml2-dev = CSWlibxml2devel
 SPKG_DESC_CSWlibxml2-dev = XML Parser Library Developer Files
 RUNTIME_DEP_PKGS_CSWlibxml2-dev = CSWlibxml2-2
-PKGFILES_CSWlibxml2-dev  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibxml2-dev += $(docdir)/libxml2/.*
-PKGFILES_CSWlibxml2-dev += $(sharedstatedir)/gtk-doc/.*
-PKGFILES_CSWlibxml2-dev += $(libdir)/xml2Conf.sh
-PKGFILES_CSWlibxml2-dev += $(call isadirs,$(libdir),xml2Conf.sh)
+# PKGFILES is catchall
+# PKGFILES_CSWlibxml2-dev  = $(PKGFILES_DEVEL)
+# PKGFILES_CSWlibxml2-dev += $(docdir)/libxml2/.*
+# PKGFILES_CSWlibxml2-dev += $(sharedstatedir)/gtk-doc/.*
+# PKGFILES_CSWlibxml2-dev += $(libdir)/xml2Conf.sh
+# PKGFILES_CSWlibxml2-dev += $(call isadirs,$(libdir),xml2Conf.sh)
 
 PACKAGES += CSWpy-libxml2
 OBSOLETED_BY_CSWpy-libxml2 = CSWpylibxml2
@@ -64,18 +78,18 @@
 RUNTIME_DEP_PKGS_CSWpy-libxml2  = CSWlibpython2-6-1-0
 RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWpy-libxml2 += CSWpython
-PKGFILES_CSWpy-libxml2  = $(libdir)/python/.*
-PKGFILES_CSWpy-libxml2 += $(docdir)/pylibxml2/.*
+PKGFILES_CSWpy-libxml2 += $(libdir)/python.*
+PKGFILES_CSWpy-libxml2 += $(docdir)/libxml2-python-*
 # There is no 64-bit Python.
 CHECKPKG_OVERRIDES_CSWpy-libxml2 += 64-bit-binaries-missing
 
-EXTRA_PAX_ARGS  = -s ",^\.$(docdir)/libxml2-$(VERSION),.$(docdir)/libxml2,p"
-EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p"
-EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p"
+#EXTRA_PAX_ARGS  = -s ",^\.$(docdir)/libxml2-$(VERSION),.$(docdir)/libxml2,p"
+#EXTRA_PAX_ARGS += -s ",^\.$(docdir)/libxml2-python-$(VERSION),.$(docdir)/pylibxml2,p"
+# EXTRA_PAX_ARGS += -s ",^\.$(libdir)/python[^/]*,.$(libdir)/python,p"
 
 CHECKPKG_OVERRIDES_CSWlibxml2-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/libxml2/html/xml.html
 
 # http://lists.opencsw.org/pipermail/maintainers/2011-August/015093.html
-SKIPTEST = 1
+SKIPTEST ?= 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libxml2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libxml2/trunk/checksums	2015-10-23 11:47:30 UTC (rev 25309)
+++ csw/mgar/pkg/libxml2/trunk/checksums	2015-10-23 13:29:55 UTC (rev 25310)
@@ -1 +1 @@
-9c0cfef285d5c4a5c80d00904ddab380  libxml2-2.9.1.tar.gz
+9e6a9aca9d155737868b3dc5fd82f788  libxml2-2.9.2.tar.gz

Deleted: csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch	2015-10-23 11:47:30 UTC (rev 25309)
+++ csw/mgar/pkg/libxml2/trunk/files/0001-Forcefully-disable-the-symbol-versioning.patch	2015-10-23 13:29:55 UTC (rev 25310)
@@ -1,36 +0,0 @@
-From 43f2a579cd9808557fa2d8ce4d5f5b6f94d627b0 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sat, 25 May 2013 09:07:33 +0200
-Subject: [PATCH] Forcefully disable the symbol versioning 2
-
----
- configure | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/configure b/configure
-index 80dd0fc..f314402 100755
---- a/configure
-+++ b/configure
-@@ -11876,18 +11876,10 @@ if test "$lt_cv_prog_gnu_ld" = yes; then
-   VERSION_SCRIPT_FLAGS=-Wl,--version-script=
- else
-   case $host in
--  *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";;
-+  *-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M";;
-   esac
- fi
- 
-- if test -n "$VERSION_SCRIPT_FLAGS"; then
--  USE_VERSION_SCRIPT_TRUE=
--  USE_VERSION_SCRIPT_FALSE='#'
--else
--  USE_VERSION_SCRIPT_TRUE='#'
--  USE_VERSION_SCRIPT_FALSE=
--fi
--
- 
- 
- _cppflags="${CPPFLAGS}"
--- 
-1.8.1.4
-

Deleted: csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch
===================================================================
--- csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch	2015-10-23 11:47:30 UTC (rev 25309)
+++ csw/mgar/pkg/libxml2/trunk/files/0002-fix-PyCapsulate-for-python-version-less-2.7.patch	2015-10-23 13:29:55 UTC (rev 25310)
@@ -1,17 +0,0 @@
---- a/python/libxml_wrap.h
-+++ b/python/libxml_wrap.h
-@@ -34,13 +34,13 @@
- #define PyBytes_AsString PyString_AsString
- #define PyBytes_AS_STRING PyString_AS_STRING
- #define PyBytes_GET_SIZE PyString_GET_SIZE
-+#endif
- 
- #define PyCapsule_New PyCObject_FromVoidPtrAndDesc
- #define PyCapsule_CheckExact PyCObject_Check
- #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
- 
- #endif
--#endif
- 
- /**
-  * ATTRIBUTE_UNUSED:

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