SF.net SVN: gar:[25814] csw/mgar/pkg/subversion/trunk/Makefile

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Jul 12 07:57:34 CEST 2016


Revision: 25814
          http://sourceforge.net/p/gar/code/25814
Author:   dmichelsen
Date:     2016-07-12 05:57:33 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
subversion/trunk: Add Python Modulation

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2016-07-08 20:38:52 UTC (rev 25813)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2016-07-12 05:57:33 UTC (rev 25814)
@@ -44,9 +44,15 @@
 VENDOR_URL = http://subversion.apache.org
 LICENSE = LICENSE
 
-# solaris9 does not have the newest glib2 any more so no gnome-keychain on Solaris9
-PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386  solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 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
+
 BUILD_DEP_PKGS += CSWlibexpat-dev
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
 BUILD_DEP_PKGS-5.10 += CSWlibserf-dev
@@ -241,7 +247,10 @@
 CONFIGURE_ARGS += --with-zlib=$(prefix)
 CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
 
-# No Keyring on Solaris9
+# Version from PYTHON modulation
+CONFIGURE_ARGS += --with-python=$(PYTHON)
+
+# No Keyring on Solaris 9
 CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
@@ -335,13 +344,16 @@
 		$(WORKSRC)/subversion/bindings/swig/python/*.py
 	@# Switch from Sun Studio PIC to GCC PIC
 	cd $(WORKSRC) && cp libtool libtool.suncc && perl -i.orig -npe 's/-KPIC -DPIC/-fPIC/g; s/-xarch=pentium_pro -xchip=pentium_pro/-march=pentiumpro/g' libtool
-	cd $(WORKSRC) && perl -i.orig -np \
+	cd $(WORKSRC) && \
+		perl -i.orig -np \
 		-e 's,(SWIG_PY_COMPILE = .*) -xO3 (.*) -xarch=pentium_pro -xchip=pentium_pro,$$1 -O2 -pipe $$2 -march=pentiumpro,g;' \
 		-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=sparc (.*)!$$1 -mcpu=v9 -Wa,-xarch=v8plus $$2!;' \
 		-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=386 +-mt(.*)!$$1 -m32 -march=i386 $$2!;' \
 		-e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=v8 +-mt(.*)!$$1 -mcpu=v8 $$2!;' \
 		-e 's,/opt/solarisstudio12.3/bin/cc,/opt/csw/bin/gcc-5.2,g;' \
 		-e 's,(SWIG_PY_LINK = .*) -march=pentiumpro (.*),$$1 $$2,;' \
+		-e 's,(^swig_pydir =) .*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/subversion/libsvn,;' \
+		-e 's,(^swig_pydir_extra =).*,$$1 $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')/subversion/svn,;' \
 		Makefile
 	/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py
 	/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)

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