From b6a8bdf5590ad71d52785c20a2d7702dad659aad Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 30 Nov 2018 18:59:42 -0500 Subject: [PATCH] tools: stop building tools version of libctf --- usr/src/.gitignore | 2 - usr/src/pkg/manifests/developer-build-onbld.mf | 2 - usr/src/tools/ctf/Makefile | 2 +- usr/src/tools/ctf/libctf/Makefile | 45 ----------------- usr/src/tools/ctf/libctf/Makefile.com | 67 -------------------------- usr/src/tools/ctf/libctf/i386/Makefile | 18 ------- 6 files changed, 1 insertion(+), 135 deletions(-) delete mode 100644 usr/src/tools/ctf/libctf/Makefile delete mode 100644 usr/src/tools/ctf/libctf/Makefile.com delete mode 100644 usr/src/tools/ctf/libctf/i386/Makefile diff --git a/usr/src/.gitignore b/usr/src/.gitignore index 5fc79e8c13..45680cdbb2 100644 --- a/usr/src/.gitignore +++ b/usr/src/.gitignore @@ -4614,8 +4614,6 @@ test/zfs-tests/tests/functional/threadsappend/threadsappend tools/btxld/btxld tools/codereview/codereview tools/ctf/ctfstrip/ctfstrip -tools/ctf/libctf/i386/libctf.so.1 -tools/ctf/libctf/i386/pics/ tools/ctf/stabs/i386/ctfstabs tools/elfextract/elfextract tools/makesoftcore/makesoftcore diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index b8ef926142..5bc0226d1e 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -88,7 +88,6 @@ file path=opt/onbld/etc/exception_lists/interface_check file path=opt/onbld/etc/exception_lists/interface_cmp file path=opt/onbld/etc/its.conf file path=opt/onbld/etc/its.reg -file path=opt/onbld/lib/$(ARCH)/libctf.so.1 mode=0555 file path=opt/onbld/lib/perl/onbld_elfmod.pm file path=opt/onbld/lib/perl/onbld_elfmod_vertype.pm file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks/CStyle.py \ @@ -172,6 +171,5 @@ file path=opt/onbld/man/man1/wsdiff.1 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=opt/onbld/bin/git-nits target=git-pbchk -link path=opt/onbld/lib/$(ARCH)/libctf.so target=libctf.so.1 link path=opt/onbld/lib/python target=python$(PYTHON_VERSION) link path=opt/onbld/man/man1/git-nits.1 target=git-pbchk.1 diff --git a/usr/src/tools/ctf/Makefile b/usr/src/tools/ctf/Makefile index fb1f7a9f48..95288b6244 100644 --- a/usr/src/tools/ctf/Makefile +++ b/usr/src/tools/ctf/Makefile @@ -26,7 +26,7 @@ include ../Makefile.tools -SUBDIRS = stabs ctfstrip libctf +SUBDIRS = stabs ctfstrip .PARALLEL: $(SUBDIRS) diff --git a/usr/src/tools/ctf/libctf/Makefile b/usr/src/tools/ctf/libctf/Makefile deleted file mode 100644 index bbd11dfd65..0000000000 --- a/usr/src/tools/ctf/libctf/Makefile +++ /dev/null @@ -1,45 +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 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -include ../../Makefile.tools - -HDRS = libctf.h -HDRDIR = common - -SUBDIRS = $(MACH) - -all := TARGET = all -clean := TARGET = clean -clobber := TARGET = clobber -install := TARGET = install - -.KEEP_STATE: - -all clean clobber install: $(SUBDIRS) - -$(SUBDIRS): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/tools/ctf/libctf/Makefile.com b/usr/src/tools/ctf/libctf/Makefile.com deleted file mode 100644 index ac427c8f17..0000000000 --- a/usr/src/tools/ctf/libctf/Makefile.com +++ /dev/null @@ -1,67 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright (c) 2015, Joyent, Inc. -# - -# -# To help deal with the fact that libavl may not exist on the host system, we -# just build it in here. However, we must do so before we include the shared -# Makefile. -# -OBJECTS += avl.o - -include $(SRC)/lib/libctf/Makefile.shared.com -include ../../Makefile.ctf - -# -# For some reason LDFLAGS doesn't seem to be taking effect at the -# moment. Therefore add what we need to LDLIBS for now. -# -LDLIBS += \ - -L$(ROOTONBLDLIBMACH) \ - '-R$$ORIGIN/../../lib/$(MACH)' \ - -CPPFLAGS += -I$(SRC)/lib/libctf/common/ \ - -I$(SRC)/lib/libdwarf/common/ \ - -I$(SRC)/lib/mergeq \ - -include ../../common/ctf_headers.h \ - -DCTF_OLD_VERSIONS \ - -DCTF_TOOLS_BUILD -LDLIBS += -lc -lelf -ldwarf - -.KEEP_STATE: - -all: $(LIBS) - -install: all $(ROOTONBLDLIBMACH)/libctf.so.1 $(ROOTONBLDLIBMACH)/libctf.so - -$(ROOTONBLDLIBMACH)/%: % - $(INS.file) - -$(ROOTONBLDLIBMACH)/$(LIBLINKS): $(ROOTONBLDLIBMACH)/$(LIBLINKS)$(VERS) - $(INS.liblink) - -# -# We can't actually add ctf to ourselves, because we're part of the tools -# for creating CTF. -# -$(DYNLIB) := CTFMERGE_POST= : -CTFCONVERT_O= : - -include $(SRC)/lib/Makefile.targ -include $(SRC)/lib/libctf/Makefile.shared.targ - - -pics/%.o: $(SRC)/common/avl/%.c - $(COMPILE.c) -o $@ $< - $(POST_PROCESS_O) diff --git a/usr/src/tools/ctf/libctf/i386/Makefile b/usr/src/tools/ctf/libctf/i386/Makefile deleted file mode 100644 index bb2f077f86..0000000000 --- a/usr/src/tools/ctf/libctf/i386/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright (c) 2015, Joyent, Inc. -# - -include ../Makefile.com - -all: $(LIBS) -- 2.11.4.GIT