Mercurial > unleashed

changeset 20624:929fde2011e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install 64-bit pylibbe only & into path without /64/ in it
author Lauri Tirkkonen <lotheac@iki.fi>
date Tue, 21 May 2019 12:48:09 +0000
parents f4ebd9e4da4c
children 10e775c2d030
files usr/src/Targetdirs usr/src/lib/pylibbe/Makefile usr/src/lib/pylibbe/Makefile.com usr/src/pkg/manifests/system-library-python-libbe-2.inc
diffstat 4 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Targetdirs	Sun May 19 21:41:54 2019 +0000
+++ b/usr/src/Targetdirs	Tue May 21 12:48:09 2019 +0000
@@ -62,9 +62,6 @@
 	/usr/lib/python$(PYTHON_VERSION) \
 	/usr/lib/python$(PYTHON_VERSION)/vendor-packages \
 
-$(BUILDPY2)PYTHON2_64DIRS += \
-	/usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 \
-
 $(BUILDPY3)PYTHON3_DIRS += \
 	/usr/lib/python$(PYTHON3_VERSION) \
 	/usr/lib/python$(PYTHON3_VERSION)/vendor-packages \
--- a/usr/src/lib/pylibbe/Makefile	Sun May 19 21:41:54 2019 +0000
+++ b/usr/src/lib/pylibbe/Makefile	Tue May 21 12:48:09 2019 +0000
@@ -28,7 +28,6 @@
 include	../Makefile.lib
 
 SUBDIRS=
-$(BUILDPY2)SUBDIRS += $(MACH)
 $(BUILD64)$(BUILDPY2)SUBDIRS += $(MACH64)
 $(BUILD64)$(BUILDPY3)SUBDIRS += py3
 
--- a/usr/src/lib/pylibbe/Makefile.com	Sun May 19 21:41:54 2019 +0000
+++ b/usr/src/lib/pylibbe/Makefile.com	Tue May 21 12:48:09 2019 +0000
@@ -34,7 +34,7 @@
 LIBLINKS = 
 SRCDIR =	../common
 ROOTLIBDIR=	$(ROOT)/usr/lib/python$(PYVER)/vendor-packages
-ROOTLIBDIR64=	$(ROOT)/usr/lib/python$(PYVER)/vendor-packages/64
+ROOTLIBDIR64=	$(ROOT)/usr/lib/python$(PYVER)/vendor-packages
 PYFILES=	$(PYSRCS)
 ROOTPYBEFILES=  $(PYFILES:%=$(ROOTLIBDIR)/%)
 
--- a/usr/src/pkg/manifests/system-library-python-libbe-2.inc	Sun May 19 21:41:54 2019 +0000
+++ b/usr/src/pkg/manifests/system-library-python-libbe-2.inc	Tue May 21 12:48:09 2019 +0000
@@ -24,8 +24,6 @@
 
 dir path=usr/lib/python$(PYTHON_VERSION)
 dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages
-dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/64
-file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/64/libbe_py.so
 file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/libbe_py.so
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL