Mercurial > unleashed
changeset 20625:10e775c2d030
mdb: don't build 32-bit libpython
author | Lauri Tirkkonen <lotheac@iki.fi> |
---|---|
date | Wed, 22 May 2019 20:35:22 +0000 |
parents | 929fde2011e4 |
children | 28ac1026d799 |
files | usr/src/cmd/mdb/Makefile.common usr/src/cmd/mdb/intel/amd64/Makefile usr/src/cmd/mdb/intel/ia32/libpython/Makefile usr/src/pkg/manifests/developer-debug-mdb.mf |
diffstat | 4 files changed, 1 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/mdb/Makefile.common Tue May 21 12:48:09 2019 +0000 +++ b/usr/src/cmd/mdb/Makefile.common Wed May 22 20:35:22 2019 +0000 @@ -37,7 +37,6 @@ libcmdutils \ libnvpair \ libproc \ - libpython \ libsysevent \ libtopo \ libumem \
--- a/usr/src/cmd/mdb/intel/amd64/Makefile Tue May 21 12:48:09 2019 +0000 +++ b/usr/src/cmd/mdb/intel/amd64/Makefile Wed May 22 20:35:22 2019 +0000 @@ -25,7 +25,7 @@ include ../../Makefile.common -MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM) uhci +MODULES = $(COMMON_MODULES_PROC) $(COMMON_MODULES_KVM) uhci libpython SUBDIRS = mdb mdb_ks kmdb libstandctf libstand .WAIT $(MODULES)
--- a/usr/src/cmd/mdb/intel/ia32/libpython/Makefile Tue May 21 12:48:09 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include $(SRC)/Makefile.master - -MODULE = libpython$(PYTHON_VERSION).so -MDBTGT = proc -MODULE_NAME = libpython - -MODSRCS_DIR = ../../../common/modules/libpython - -MODSRCS = libpython.c - -include ../../../../Makefile.cmd -include ../../Makefile.ia32 -include ../../../Makefile.module - -%.o := CPPFLAGS += $(PYCPPFLAGS) - -dmod/$(MODULE) := LDLIBS += -lproc - -%.o: $(MODSRCS_DIR)/%.c - $(COMPILE.c) $< - $(CTFCONVERT_O)
--- a/usr/src/pkg/manifests/developer-debug-mdb.mf Tue May 21 12:48:09 2019 +0000 +++ b/usr/src/pkg/manifests/developer-debug-mdb.mf Wed May 22 20:35:22 2019 +0000 @@ -149,7 +149,6 @@ file path=usr/lib/mdb/proc/libcmdutils.so group=sys mode=0555 file path=usr/lib/mdb/proc/libnvpair.so group=sys mode=0555 file path=usr/lib/mdb/proc/libproc.so group=sys mode=0555 -file path=usr/lib/mdb/proc/libpython$(PYTHON_VERSION).so group=sys mode=0555 file path=usr/lib/mdb/proc/libsysevent.so group=sys mode=0555 file path=usr/lib/mdb/proc/libtopo.so group=sys mode=0555 file path=usr/lib/mdb/proc/libumem.so group=sys mode=0555