From 87aea72cefaa0f85220264ab8462c9a19caba0ef Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Wed, 20 Feb 2019 16:50:57 +0100
Subject: [PATCH] Remove obsoleted lint-libraries from build system
---
components/library/readline/Makefile | 5 -
components/text/tidy/manifests/sample-manifest.p5m | 3
components/library/zlib/zlib.p5m | 3
components/library/fastcgi/Makefile | 1
components/library/mpfr/Makefile | 3
components/archiver/bzip2/Makefile | 13 +--
components/library/libxml2/libxml2.p5m | 3
components/library/trousers/manifests/sample-manifest.p5m | 5 -
components/library/trousers/trousers.p5m | 4 -
components/python/python34/Makefile | 6 -
components/library/openssl/openssl-1.0.2/Makefile | 21 ----
components/library/openssl/openssl-1.0.2/manifests/sample-manifest.p5m | 6 -
components/library/zlib/Makefile | 3
components/library/gd2/Makefile | 4
components/library/gd2/gd2.p5m | 3
components/library/openssl/openssl-1.0.2/openssl-1.0.2.p5m | 29 -------
components/library/pcre/Makefile | 3
components/library/fastcgi/fcgi.p5m | 1
components/text/tidy/tidy.p5m | 3
components/library/lcms2/Makefile | 2
components/library/trousers/Makefile | 3
/dev/null | 68 -----------------
components/text/tidy/Makefile | 3
components/library/lcms/Makefile | 4
components/library/readline/manifests/sample-manifest.p5m | 13 ---
components/library/libxml2/Makefile | 3
components/python/python35/Makefile | 5 -
components/library/pcre/pcre.p5m | 1
make-rules/common.mk | 9 --
components/library/readline/readline.p5m | 3
30 files changed, 23 insertions(+), 210 deletions(-)
diff --git a/components/archiver/bzip2/Makefile b/components/archiver/bzip2/Makefile
index 7e179bd..57ad8d4 100644
--- a/components/archiver/bzip2/Makefile
+++ b/components/archiver/bzip2/Makefile
@@ -27,7 +27,7 @@
COMPONENT_NAME= bzip2
COMPONENT_VERSION= 1.0.6
-COMPONENT_REVISION= 3
+COMPONENT_REVISION= 4
COMPONENT_PROJECT_URL= http://www.bzip.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -36,15 +36,12 @@
COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/bzip
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/justmake.mk
-include $(WS_TOP)/make-rules/ips.mk
-#include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
# Enable ASLR for this component
ASLR_MODE = $(ASLR_ENABLE)
-
-#LINT_FLAGS += -I.
# we need to enable large file support and build PIC for our shared libraries
CFLAGS += $(CPP_LARGEFILES) $(CC_PIC)
@@ -78,7 +75,7 @@
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
-include $(WS_TOP)/make-rules/depend.mk
+include $(WS_MAKE_RULES)/depend.mk
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library
diff --git a/components/library/fastcgi/Makefile b/components/library/fastcgi/Makefile
index 262f291..7e44d35 100644
--- a/components/library/fastcgi/Makefile
+++ b/components/library/fastcgi/Makefile
@@ -27,6 +27,7 @@
COMPONENT_NAME= fastcgi
COMPONENT_VERSION= 2.4.0
+COMPONENT_REVISION= 1
COMPONENT_FMRI= library/fastcgi
COMPONENT_SUMMARY= the FastCGI web server interface
COMPONENT_CLASSIFICATION=Web Services/Application and Web Servers
diff --git a/components/library/fastcgi/fcgi.p5m b/components/library/fastcgi/fcgi.p5m
index 5c7a60c..4afb688 100644
--- a/components/library/fastcgi/fcgi.p5m
+++ b/components/library/fastcgi/fcgi.p5m
@@ -44,7 +44,6 @@
link path=usr/lib/libfcgi.so.0 target=libfcgi.so.0.0.0
file path=usr/lib/libfcgi.so.0.0.0
-file llib-lfcgi path=usr/lib/llib-lfcgi
file doc/cgi-fcgi.1 path=usr/share/man/man1/cgi-fcgi.1
file doc/FCGI_Accept.3 path=usr/share/man/man3/FCGI_Accept.3
file doc/FCGI_Finish.3 path=usr/share/man/man3/FCGI_Finish.3
diff --git a/components/library/fastcgi/llib-lfcgi b/components/library/fastcgi/llib-lfcgi
deleted file mode 100644
index 6ab09cf..0000000
--- a/components/library/fastcgi/llib-lfcgi
+++ /dev/null
@@ -1,34 +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 (c) 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <fastcgi.h>
-#include <fcgi_stdio.h>
-#include <fcgiapp.h>
-#include <fcgimisc.h>
-#include <fcgios.h>
-#include <fcgi_config.h>
diff --git a/components/library/gd2/Makefile b/components/library/gd2/Makefile
index 062509f..46806bf 100644
--- a/components/library/gd2/Makefile
+++ b/components/library/gd2/Makefile
@@ -26,7 +26,7 @@
COMPONENT_NAME= gd2
COMPONENT_VERSION= 2.2.4
-COMPONENT_REVISION= 4
+COMPONENT_REVISION= 5
COMPONENT_FMRI= library/gd
COMPONENT_SUMMARY= The Graphics Draw Library
COMPONENT_CLASSIFICATION= System/Libraries
@@ -42,13 +42,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/cmake.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
PATH=$(PATH.gnu)
CFLAGS += $(CPP_LARGEFILES)
CPPFLAGS += $(CPP_LARGEFILES)
-LINT_FLAGS += -I$(SOURCE_DIR)/src
# build with the distribution preferred libjpeg implementation
CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
diff --git a/components/library/gd2/gd2.p5m b/components/library/gd2/gd2.p5m
index 299fce7..6e504df 100644
--- a/components/library/gd2/gd2.p5m
+++ b/components/library/gd2/gd2.p5m
@@ -84,13 +84,10 @@
link path=usr/lib/$(MACH64)/libgd.so target=libgd.so.3
link path=usr/lib/$(MACH64)/libgd.so.3 target=libgd.so.3.0.4
file path=usr/lib/$(MACH64)/libgd.so.3.0.4
-file path=usr/lib/$(MACH64)/llib-lgd.ln
file path=usr/lib/$(MACH64)/pkgconfig/gdlib.pc
link path=usr/lib/libgd.so target=libgd.so.3
link path=usr/lib/libgd.so.3 target=libgd.so.3.0.4
file path=usr/lib/libgd.so.3.0.4
-file path=usr/lib/llib-lgd
-file llib-lgd path=usr/lib/llib-lgd.ln
file path=usr/lib/pkgconfig/gdlib.pc
file path=usr/share/doc/gd2/INSTALL
file path=usr/share/doc/gd2/README.CMAKE
diff --git a/components/library/gd2/llib-lgd b/components/library/gd2/llib-lgd
deleted file mode 100644
index 21c022e..0000000
--- a/components/library/gd2/llib-lgd
+++ /dev/null
@@ -1,39 +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 (c) 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-
-#include <gd.h>
-#include <gdhelpers.h>
-#include <gdcache.h>
diff --git a/components/library/gmp/llib-lgmp b/components/library/gmp/llib-lgmp
deleted file mode 100644
index d25482c..0000000
--- a/components/library/gmp/llib-lgmp
+++ /dev/null
@@ -1,37 +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 (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <gmp.h>
-
diff --git a/components/library/lcms/Makefile b/components/library/lcms/Makefile
index 356a2a8..0060d9b 100644
--- a/components/library/lcms/Makefile
+++ b/components/library/lcms/Makefile
@@ -24,7 +24,7 @@
COMPONENT_NAME = lcms
COMPONENT_VERSION= 1.19
-COMPONENT_REVISION= 2
+COMPONENT_REVISION= 3
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://www.littlecms.com/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -78,8 +78,6 @@
$(CP) -p $(SOURCE_DIR)/include/lcms.h ./include/ ; \
$(RM) -f $(SOURCE_DIR)/include/icc34.h ; \
$(CP) -p include/icc34.h $(SOURCE_DIR)/include/ )
-
-LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
build: $(BUILD_32_and_64)
diff --git a/components/library/lcms/llib-llcms b/components/library/lcms/llib-llcms
deleted file mode 100644
index a3b03de..0000000
--- a/components/library/lcms/llib-llcms
+++ /dev/null
@@ -1,36 +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 (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <lcms.h>
diff --git a/components/library/lcms2/Makefile b/components/library/lcms2/Makefile
index 2982927..7abaf9c 100644
--- a/components/library/lcms2/Makefile
+++ b/components/library/lcms2/Makefile
@@ -24,6 +24,7 @@
COMPONENT_NAME = lcms2
COMPONENT_VERSION= 2.9
+COMPONENT_REVISION= 1
COMPONENT_FMRI= library/lcms2
COMPONENT_CLASSIFICATION=System/Libraries
COMPONENT_SUMMARY= The Little Color Management System
@@ -39,7 +40,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
# build with the distribution preferred libjpeg implementation
CFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
diff --git a/components/library/libmng/llib-lmng b/components/library/libmng/llib-lmng
deleted file mode 100644
index 9e4d0c3..0000000
--- a/components/library/libmng/llib-lmng
+++ /dev/null
@@ -1,37 +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 (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <libmng.h>
-
diff --git a/components/library/libxml2/Makefile b/components/library/libxml2/Makefile
index fd451b3..60c7291 100644
--- a/components/library/libxml2/Makefile
+++ b/components/library/libxml2/Makefile
@@ -28,7 +28,7 @@
COMPONENT_NAME= libxml2
COMPONENT_VERSION= 2.9.7
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_PROJECT_URL= http://xmlsoft.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -46,7 +46,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
CFLAGS += $(CPP_LARGEFILES)
LDFLAGS += $(CC_BITS) $(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread
diff --git a/components/library/libxml2/libxml2.p5m b/components/library/libxml2/libxml2.p5m
index 66de624..41721ec 100644
--- a/components/library/libxml2/libxml2.p5m
+++ b/components/library/libxml2/libxml2.p5m
@@ -88,13 +88,10 @@
link path=usr/lib/$(MACH64)/libxml2.so target=libxml2.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/libxml2.so.$(COMPONENT_VERSION)
link path=usr/lib/$(MACH64)/libxml2.so.2 target=libxml2.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/llib-lxml2.ln
file path=usr/lib/$(MACH64)/pkgconfig/libxml-2.0.pc
link path=usr/lib/libxml2.so target=libxml2.so.$(COMPONENT_VERSION)
file path=usr/lib/libxml2.so.$(COMPONENT_VERSION)
link path=usr/lib/libxml2.so.2 target=libxml2.so.$(COMPONENT_VERSION)
-file path=usr/lib/llib-lxml2
-file path=usr/lib/llib-lxml2.ln
file path=usr/lib/pkgconfig/libxml-2.0.pc
file path=usr/share/aclocal/libxml.m4
file path=usr/share/man/man1/xml2-config.1 facet.devel=all
diff --git a/components/library/libxml2/llib-lxml2 b/components/library/libxml2/llib-lxml2
deleted file mode 100644
index b0201aa..0000000
--- a/components/library/libxml2/llib-lxml2
+++ /dev/null
@@ -1,84 +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 (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#undef _LARGEFILE_SOURCE
-
-#include <libxml/DOCBparser.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/HTMLtree.h>
-#include <libxml/SAX.h>
-#include <libxml/SAX2.h>
-#include <libxml/c14n.h>
-#include <libxml/catalog.h>
-#include <libxml/chvalid.h>
-#include <libxml/debugXML.h>
-#include <libxml/dict.h>
-#include <libxml/encoding.h>
-#include <libxml/entities.h>
-#include <libxml/globals.h>
-#include <libxml/hash.h>
-#include <libxml/list.h>
-#include <libxml/nanoftp.h>
-#include <libxml/nanohttp.h>
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/pattern.h>
-#include <libxml/relaxng.h>
-#include <libxml/schemasInternals.h>
-#include <libxml/schematron.h>
-#include <libxml/threads.h>
-#include <libxml/tree.h>
-#include <libxml/uri.h>
-#include <libxml/valid.h>
-#include <libxml/xinclude.h>
-#include <libxml/xlink.h>
-#include <libxml/xmlIO.h>
-#include <libxml/xmlautomata.h>
-#include <libxml/xmlerror.h>
-#include <libxml/xmlexports.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/xmlmodule.h>
-#include <libxml/xmlreader.h>
-#include <libxml/xmlregexp.h>
-#include <libxml/xmlsave.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
-#include <libxml/xmlstring.h>
-#include <libxml/xmlunicode.h>
-#include <libxml/xmlversion.h>
-#include <libxml/xmlwriter.h>
-#include <libxml/xpath.h>
-#include <libxml/xpathInternals.h>
-#include <libxml/xpointer.h>
diff --git a/components/library/mpfr/Makefile b/components/library/mpfr/Makefile
index f3d52d8..dad9ccf 100644
--- a/components/library/mpfr/Makefile
+++ b/components/library/mpfr/Makefile
@@ -27,6 +27,7 @@
COMPONENT_NAME= mpfr
COMPONENT_VERSION= 3.1.6
+COMPONENT_REVISION= 1
IPS_COMPONENT_VERSION= 3.1.6.1
COMPONENT_SUMMARY= The GNU Multiple Precision with IEEE Rounding Floating-Point Library
COMPONENT_PROJECT_URL= http://www.mpfr.org/
@@ -84,8 +85,6 @@
CONFIGURE_OPTIONS += --with-gmp-lib=$(GMPLIBDIR_$(BITS))
CONFIGURE_OPTIONS += --with-mulhigh-size=$(MPFRMULHIGH)
CONFIGURE_OPTIONS += --with-pic
-
-LINT_FLAGS += -I/usr/include/gmp
PROTOUSRSHAREINFODIR = $(PROTOUSRSHAREDIR)/info
PROTOUSRSHAREHTMLDIR = $(PROTOUSRSHAREDIR)/doc/mpfr/html
diff --git a/components/library/mpfr/llib-lmpfr b/components/library/mpfr/llib-lmpfr
deleted file mode 100644
index eab0197..0000000
--- a/components/library/mpfr/llib-lmpfr
+++ /dev/null
@@ -1,37 +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 (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <mpfr.h>
-
diff --git a/components/library/openssl/openssl-1.0.2/Makefile b/components/library/openssl/openssl-1.0.2/Makefile
index 4eaf3d9..811ec26 100644
--- a/components/library/openssl/openssl-1.0.2/Makefile
+++ b/components/library/openssl/openssl-1.0.2/Makefile
@@ -31,6 +31,7 @@
# Version for IPS. It is easier to do it manually than convert the letter to a
# number while taking into account that there might be no letter at all.
IPS_COMPONENT_VERSION = 1.0.2.17
+COMPONENT_REVISION = 1
COMPONENT_PROJECT_URL= https://www.openssl.org
COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz
@@ -44,7 +45,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
PATH=$(GCC_ROOT)/bin:$(PATH.illumos)
@@ -66,8 +66,7 @@
CONFIGURE_OPTIONS = -DSOLARIS_OPENSSL -DNO_WINDOWS_BRAINDEATH
CONFIGURE_OPTIONS += --openssldir=/etc/openssl
CONFIGURE_OPTIONS += --prefix=/usr
-# We use OpenSSL install code for installing only manual pages and we do that
-# for 32-bit version only.
+# We use OpenSSL install code for installing only manual pages and headers.
CONFIGURE_OPTIONS += --install_prefix=$(PROTO_DIR)
CONFIGURE_OPTIONS += no-rc3
CONFIGURE_OPTIONS += no-rc5
@@ -189,24 +188,10 @@
# from the tarball which would corrupt some man pages.
COMPONENT_INSTALL_ARGS += PATH=$(PATH) MANDIR=/usr/share/man
-# We could run OpenSSL install code for 32 bits only to process header files and
-# manual pages. However, lint libraries depend on install stamps so we run
-# install for 64 bit as well. Note that we must take built binary files from
+# Note that we take built binary files from
# build directories, not from the proto area which contains whatever was
# installed first.
install: $(INSTALL_32_and_64) $(PROTO_DIR)/.openssl-0.9.8
-
-# We need to modify the default lint flags to include patched opensslconf.h from
-# the build directory. If we do not do that, lint will complain about md2.h
-# which is not enabled by default but it is in our opensslconf.h.
-LFLAGS_32 := -I$(BUILD_DIR_32)/include $(LINT_FLAGS) -lsoftcrypto
-LFLAGS_64 := -I$(BUILD_DIR_64)/include $(LINT_FLAGS) -lsoftcrypto
-
-# Set modified lint flags for our lint library targets.
-$(BUILD_DIR_32)/llib-lcrypto.ln: LINT_FLAGS=$(LFLAGS_32)
-$(BUILD_DIR_32)/llib-lssl.ln: LINT_FLAGS=$(LFLAGS_32)
-$(BUILD_DIR_64)/llib-lcrypto.ln: LINT_FLAGS=$(LFLAGS_64)
-$(BUILD_DIR_64)/llib-lssl.ln: LINT_FLAGS=$(LFLAGS_64)
# There are also separate STC test suites 'openssl' and 'openssl-engine'
# for regression testing. These internal tests are unit tests only.
diff --git a/components/library/openssl/openssl-1.0.2/llib-lcrypto b/components/library/openssl/openssl-1.0.2/llib-lcrypto
deleted file mode 100644
index 5e86fa4..0000000
--- a/components/library/openssl/openssl-1.0.2/llib-lcrypto
+++ /dev/null
@@ -1,83 +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 (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <openssl/aes.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/asn1t.h>
-#include <openssl/bio.h>
-#include <openssl/blowfish.h>
-#include <openssl/bn.h>
-#include <openssl/buffer.h>
-#include <openssl/camellia.h>
-#include <openssl/cms.h>
-#include <openssl/comp.h>
-#include <openssl/conf.h>
-#include <openssl/conf_api.h>
-#include <openssl/crypto.h>
-#include <openssl/des.h>
-#include <openssl/dh.h>
-#include <openssl/dsa.h>
-#include <openssl/dso.h>
-#include <openssl/e_os2.h>
-#include <openssl/ebcdic.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/krb5_asn.h>
-#include <openssl/kssl.h>
-#include <openssl/lhash.h>
-#include <openssl/md2.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-#include <openssl/modes.h>
-#include <openssl/obj_mac.h>
-#include <openssl/objects.h>
-#include <openssl/opensslconf.h>
-#include <openssl/opensslv.h>
-#include <openssl/pem.h>
-#include <openssl/pem2.h>
-#include <openssl/pkcs12.h>
-#include <openssl/pkcs7.h>
-#include <openssl/pqueue.h>
-#include <openssl/rand.h>
-#include <openssl/ripemd.h>
-#include <openssl/rsa.h>
-#include <openssl/safestack.h>
-#include <openssl/sha.h>
-#include <openssl/stack.h>
-#include <openssl/symhacks.h>
-#include <openssl/ts.h>
-#include <openssl/txt_db.h>
-#include <openssl/ui.h>
-#include <openssl/ui_compat.h>
-#include <openssl/x509.h>
-#include <openssl/x509_vfy.h>
-#include <openssl/x509v3.h>
-
diff --git a/components/library/openssl/openssl-1.0.2/llib-lssl b/components/library/openssl/openssl-1.0.2/llib-lssl
deleted file mode 100644
index 61d4a1a..0000000
--- a/components/library/openssl/openssl-1.0.2/llib-lssl
+++ /dev/null
@@ -1,33 +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 (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <openssl/ssl.h>
-#include <openssl/ssl2.h>
-#include <openssl/ssl23.h>
-#include <openssl/ssl3.h>
-#include <openssl/tls1.h>
diff --git a/components/library/openssl/openssl-1.0.2/manifests/sample-manifest.p5m b/components/library/openssl/openssl-1.0.2/manifests/sample-manifest.p5m
index e817994..1a08f52 100644
--- a/components/library/openssl/openssl-1.0.2/manifests/sample-manifest.p5m
+++ b/components/library/openssl/openssl-1.0.2/manifests/sample-manifest.p5m
@@ -109,8 +109,6 @@
file path=usr/include/openssl/x509.h
file path=usr/include/openssl/x509_vfy.h
file path=usr/include/openssl/x509v3.h
-file path=usr/lib/$(MACH64)/llib-lcrypto.ln
-file path=usr/lib/$(MACH64)/llib-lssl.ln
file path=usr/lib/engines/lib4758cca.so
file path=usr/lib/engines/libaep.so
file path=usr/lib/engines/libatalla.so
@@ -130,10 +128,6 @@
file path=usr/lib/libssl.a
link path=usr/lib/libssl.so target=libssl.so.1.0.0
file path=usr/lib/libssl.so.1.0.0
-file path=usr/lib/llib-lcrypto
-file path=usr/lib/llib-lcrypto.ln
-file path=usr/lib/llib-lssl
-file path=usr/lib/llib-lssl.ln
file path=usr/lib/pkgconfig/libcrypto.pc
file path=usr/lib/pkgconfig/libssl.pc
file path=usr/lib/pkgconfig/openssl.pc
diff --git a/components/library/openssl/openssl-1.0.2/openssl-1.0.2.p5m b/components/library/openssl/openssl-1.0.2/openssl-1.0.2.p5m
index dbc4d89..f8e528a 100644
--- a/components/library/openssl/openssl-1.0.2/openssl-1.0.2.p5m
+++ b/components/library/openssl/openssl-1.0.2/openssl-1.0.2.p5m
@@ -55,18 +55,6 @@
link path=lib/$(MACH64)/libssl.so.1.0.0 \
target=../openssl/default/$(MACH64)/libssl.so.1.0.0 mediator=openssl \
mediator-implementation=default mediator-priority=vendor
-link path=lib/$(MACH64)/llib-lcrypto \
- target=../openssl/default/$(MACH64)/llib-lcrypto mediator=openssl \
- mediator-implementation=default mediator-priority=vendor
-link path=lib/$(MACH64)/llib-lcrypto.ln \
- target=../openssl/default/$(MACH64)/llib-lcrypto.ln mediator=openssl \
- mediator-implementation=default mediator-priority=vendor
-link path=lib/$(MACH64)/llib-lssl \
- target=../openssl/default/$(MACH64)/llib-lssl mediator=openssl \
- mediator-implementation=default mediator-priority=vendor
-link path=lib/$(MACH64)/llib-lssl.ln \
- target=../openssl/default/$(MACH64)/llib-lssl.ln mediator=openssl \
- mediator-implementation=default mediator-priority=vendor
link path=lib/libcrypto.so target=libcrypto.so.1.0.0
# Mediator links for 32-bit libraries
@@ -74,14 +62,6 @@
mediator=openssl mediator-implementation=default mediator-priority=vendor
link path=lib/libssl.so target=libssl.so.1.0.0
link path=lib/libssl.so.1.0.0 target=openssl/default/libssl.so.1.0.0 \
- mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lcrypto target=openssl/default/llib-lcrypto \
- mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lcrypto.ln target=openssl/default/llib-lcrypto.ln \
- mediator=openssl mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lssl target=openssl/default/llib-lssl mediator=openssl \
- mediator-implementation=default mediator-priority=vendor
-link path=lib/llib-lssl.ln target=openssl/default/llib-lssl.ln \
mediator=openssl mediator-implementation=default mediator-priority=vendor
# Commands.
@@ -94,11 +74,6 @@
file $(MACH64)/libssl.so.1.0.0 \
path=lib/openssl/default/$(MACH64)/libssl.so.1.0.0 owner=root group=bin \
mode=0555
-file llib-lcrypto path=lib/openssl/default/$(MACH64)/llib-lcrypto
-file $(MACH64)/llib-lcrypto.ln \
- path=lib/openssl/default/$(MACH64)/llib-lcrypto.ln
-file llib-lssl path=lib/openssl/default/$(MACH64)/llib-lssl
-file $(MACH64)/llib-lssl.ln path=lib/openssl/default/$(MACH64)/llib-lssl.ln
link path=lib/openssl/default/64 target=$(MACH64)
file etc/openssl/misc/CA.pl path=lib/openssl/default/CA.pl
link path=lib/openssl/default/engines/$(MACH64)/libpk11.so target=libpk11.so.1
@@ -135,10 +110,6 @@
link path=lib/openssl/default/libssl.so target=libssl.so.1.0.0
file $(MACH32)/libssl.so.1.0.0 path=lib/openssl/default/libssl.so.1.0.0 \
owner=root group=bin mode=0555
-file llib-lcrypto path=lib/openssl/default/llib-lcrypto
-file $(MACH32)/llib-lcrypto.ln path=lib/openssl/default/llib-lcrypto.ln
-file llib-lssl path=lib/openssl/default/llib-lssl
-file $(MACH32)/llib-lssl.ln path=lib/openssl/default/llib-lssl.ln
file $(MACH64)/apps/openssl path=lib/openssl/default/openssl owner=root \
group=bin mode=0555
dir path=lib/openssl/engines group=sys mode=0755
diff --git a/components/library/pcre/Makefile b/components/library/pcre/Makefile
index 693c413..7c61a17 100644
--- a/components/library/pcre/Makefile
+++ b/components/library/pcre/Makefile
@@ -27,6 +27,7 @@
COMPONENT_NAME= pcre
COMPONENT_VERSION= 8.42
+COMPONENT_REVISION= 1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
@@ -57,8 +58,6 @@
CXXFLAGS+= $(CPP_LARGEFILES)
#CXXFLAGS+= $(XPG5MODE)
-
-LINTFLAGS+= -I. $(studio_XBITS) $(CPP_LARGEFILES)
CONFIGURE_ENV+= "CPP=$(CC) $(CPPFLAGS) $(CFLAGS) -E"
CONFIGURE_ENV+= "CXXCPP=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -E"
diff --git a/components/library/pcre/llib-lpcre b/components/library/pcre/llib-lpcre
deleted file mode 100644
index 76ed926..0000000
--- a/components/library/pcre/llib-lpcre
+++ /dev/null
@@ -1,37 +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 (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <pcre.h>
-
diff --git a/components/library/pcre/pcre.p5m b/components/library/pcre/pcre.p5m
index 440994a..ae3a31f 100644
--- a/components/library/pcre/pcre.p5m
+++ b/components/library/pcre/pcre.p5m
@@ -23,7 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file llib-lpcre path=usr/lib/llib-lpcre
file pcre_internal.h path=usr/include/pcre/pcre_internal.h
file ucp.h path=usr/include/pcre/ucp.h
diff --git a/components/library/readline/Makefile b/components/library/readline/Makefile
index d20846a..28d4f60 100644
--- a/components/library/readline/Makefile
+++ b/components/library/readline/Makefile
@@ -27,7 +27,7 @@
COMPONENT_NAME= readline
COMPONENT_VERSION= 6.3
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_PROJECT_URL= http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -53,9 +53,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
-
-LINT_FLAGS += -I$(PROTO_DIR)/usr/include
CC += $(CC_BITS)
diff --git a/components/library/readline/llib-lreadline b/components/library/readline/llib-lreadline
deleted file mode 100644
index b0a72e4..0000000
--- a/components/library/readline/llib-lreadline
+++ /dev/null
@@ -1,34 +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 (c) 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * We need this #include for the FILE definition.
- */
-#include <stdio.h>
-
-#include <readline/readline.h>
diff --git a/components/library/readline/manifests/sample-manifest.p5m b/components/library/readline/manifests/sample-manifest.p5m
index b62d913..824dfd8 100644
--- a/components/library/readline/manifests/sample-manifest.p5m
+++ b/components/library/readline/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2018 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,33 +34,22 @@
file path=usr/lib/$(MACH64)/libhistory.old
link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.6
file path=usr/lib/$(MACH64)/libhistory.so.5
-file path=usr/lib/$(MACH64)/libhistory.so.5.old
file path=usr/lib/$(MACH64)/libhistory.so.6
-file path=usr/lib/$(MACH64)/libhistory.so.6.old
file path=usr/lib/$(MACH64)/libreadline.a
file path=usr/lib/$(MACH64)/libreadline.old
link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.6
file path=usr/lib/$(MACH64)/libreadline.so.5
-file path=usr/lib/$(MACH64)/libreadline.so.5.old
file path=usr/lib/$(MACH64)/libreadline.so.6
-file path=usr/lib/$(MACH64)/libreadline.so.6.old
-file path=usr/lib/$(MACH64)/llib-lreadline.ln
file path=usr/lib/libhistory.a
file path=usr/lib/libhistory.old
link path=usr/lib/libhistory.so target=libhistory.so.6
file path=usr/lib/libhistory.so.5
-file path=usr/lib/libhistory.so.5.old
file path=usr/lib/libhistory.so.6
-file path=usr/lib/libhistory.so.6.old
file path=usr/lib/libreadline.a
file path=usr/lib/libreadline.old
link path=usr/lib/libreadline.so target=libreadline.so.6
file path=usr/lib/libreadline.so.5
-file path=usr/lib/libreadline.so.5.old
file path=usr/lib/libreadline.so.6
-file path=usr/lib/libreadline.so.6.old
-file path=usr/lib/llib-lreadline
-file path=usr/lib/llib-lreadline.ln
file path=usr/share/doc/readline/CHANGES
file path=usr/share/doc/readline/INSTALL
file path=usr/share/doc/readline/README
diff --git a/components/library/readline/readline.p5m b/components/library/readline/readline.p5m
index 23d4c49..1759be6 100644
--- a/components/library/readline/readline.p5m
+++ b/components/library/readline/readline.p5m
@@ -51,15 +51,12 @@
link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.6
file path=usr/lib/$(MACH64)/libreadline.so.5
file path=usr/lib/$(MACH64)/libreadline.so.6
-file $(MACH64)/llib-lreadline.ln path=usr/lib/$(MACH64)/llib-lreadline.ln
link path=usr/lib/libhistory.so target=libhistory.so.6
file path=usr/lib/libhistory.so.5
file path=usr/lib/libhistory.so.6
link path=usr/lib/libreadline.so target=libreadline.so.6
file path=usr/lib/libreadline.so.5
file path=usr/lib/libreadline.so.6
-file llib-lreadline path=usr/lib/llib-lreadline
-file $(MACH32)/llib-lreadline.ln path=usr/lib/llib-lreadline.ln
file path=usr/share/info/history.info
file path=usr/share/info/readline.info
file path=usr/share/info/rluserman.info
diff --git a/components/library/trousers/Makefile b/components/library/trousers/Makefile
index 29a979a..278e7a5 100644
--- a/components/library/trousers/Makefile
+++ b/components/library/trousers/Makefile
@@ -26,7 +26,7 @@
COMPONENT_NAME= trousers
COMPONENT_VERSION= 0.3.11.2
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_PROJECT_URL= http://sourceforge.net/projects/trousers/files/trousers/
@@ -37,7 +37,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
LIBS = -lnsl -lsocket -lgen -lscf -lbsm -lresolv
CFLAGS += -DSOLARIS -DBI_OPENSSL -D_REENTRANT
diff --git a/components/library/trousers/llib-ltspi b/components/library/trousers/llib-ltspi
deleted file mode 100644
index fc7ab95..0000000
--- a/components/library/trousers/llib-ltspi
+++ /dev/null
@@ -1,54 +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 (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <sys/types.h>
-
-#include <tss/compat11b.h>
-#include <tss/platform.h>
-#include <tss/tcpa_defines.h>
-#include <tss/tcpa_error.h>
-#include <tss/tcpa_struct.h>
-#include <tss/tcpa_typedef.h>
-#include <tss/tcs.h>
-#include <tss/tcs_defines.h>
-#include <tss/tcs_error.h>
-#include <tss/tcs_structs.h>
-#include <tss/tcs_typedef.h>
-#include <tss/tddl_error.h>
-#include <tss/tddlapi_error.h>
-#include <tss/tddli.h>
-#include <tss/tpm.h>
-#include <tss/tpm_error.h>
-#include <tss/tpm_ordinal.h>
-#include <tss/tspi.h>
-#include <tss/tss_defines.h>
-#include <tss/tss_error.h>
-#include <tss/tss_error_basics.h>
-#include <tss/tss_structs.h>
-#include <tss/tss_typedef.h>
-
-#include <trousers/trousers.h>
-#include <trousers/tss.h>
diff --git a/components/library/trousers/manifests/sample-manifest.p5m b/components/library/trousers/manifests/sample-manifest.p5m
index ff56720..eb9773b 100644
--- a/components/library/trousers/manifests/sample-manifest.p5m
+++ b/components/library/trousers/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2018 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -52,14 +52,11 @@
link path=usr/lib/$(MACH64)/libtspi.so target=libtspi.so.1.2.0
link path=usr/lib/$(MACH64)/libtspi.so.1 target=libtspi.so.1.2.0
file path=usr/lib/$(MACH64)/libtspi.so.1.2.0
-file path=usr/lib/$(MACH64)/llib-ltspi.ln
file path=usr/lib/$(MACH64)/tcsd
file path=usr/lib/libtddl.a
link path=usr/lib/libtspi.so target=libtspi.so.1.2.0
link path=usr/lib/libtspi.so.1 target=libtspi.so.1.2.0
file path=usr/lib/libtspi.so.1.2.0
-file path=usr/lib/llib-ltspi
-file path=usr/lib/llib-ltspi.ln
file path=usr/lib/tcsd
file path=usr/share/man/man3/Tspi_ChangeAuth.3
file path=usr/share/man/man3/Tspi_ChangeAuthAsym.3
diff --git a/components/library/trousers/trousers.p5m b/components/library/trousers/trousers.p5m
index 322699b..b166e92 100644
--- a/components/library/trousers/trousers.p5m
+++ b/components/library/trousers/trousers.p5m
@@ -84,10 +84,6 @@
link path=usr/lib/libtspi.so.1 target=libtspi.so.1.2.0
file path=usr/lib/libtspi.so.1.2.0
-file path=usr/lib/$(MACH64)/llib-ltspi.ln
-file path=usr/lib/llib-ltspi
-file path=usr/lib/llib-ltspi.ln
-
file path=usr/share/man/man3/Tspi_ChangeAuth.3
file path=usr/share/man/man3/Tspi_ChangeAuthAsym.3
file path=usr/share/man/man3/Tspi_Context_Close.3
diff --git a/components/library/zlib/Makefile b/components/library/zlib/Makefile
index 9907201..3af8d4a 100644
--- a/components/library/zlib/Makefile
+++ b/components/library/zlib/Makefile
@@ -28,7 +28,7 @@
COMPONENT_NAME= zlib
COMPONENT_VERSION= 1.2.11
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SUMMARY= The Zip compression library
COMPONENT_PROJECT_URL= http://www.zlib.net/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -43,7 +43,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
# Zlib won't build without cloning. We need also to get rid of default
# Makefile and get our own version of zconf.h to avoid interactions
diff --git a/components/library/zlib/llib-lz b/components/library/zlib/llib-lz
deleted file mode 100644
index b09f667..0000000
--- a/components/library/zlib/llib-lz
+++ /dev/null
@@ -1,33 +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 (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <zlib.h>
-#include <zconf.h>
diff --git a/components/library/zlib/zlib.p5m b/components/library/zlib/zlib.p5m
index 5ac8e15..ee6e03b 100644
--- a/components/library/zlib/zlib.p5m
+++ b/components/library/zlib/zlib.p5m
@@ -32,13 +32,10 @@
link path=usr/lib/$(MACH64)/libz.so target=libz.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/libz.so.$(COMPONENT_VERSION)
link path=usr/lib/$(MACH64)/libz.so.1 target=libz.so.$(COMPONENT_VERSION)
-file path=usr/lib/$(MACH64)/llib-lz.ln
file path=usr/lib/$(MACH64)/pkgconfig/zlib.pc
#file path=usr/lib/libz.a
link path=usr/lib/libz.so target=libz.so.$(COMPONENT_VERSION)
file path=usr/lib/libz.so.$(COMPONENT_VERSION)
link path=usr/lib/libz.so.1 target=libz.so.$(COMPONENT_VERSION)
-file path=usr/lib/llib-lz
-file path=usr/lib/llib-lz.ln
file path=usr/lib/pkgconfig/zlib.pc
file path=usr/share/man/man3/zlib.3
diff --git a/components/python/python34/Makefile b/components/python/python34/Makefile
index af4dcf2..55cdfe4 100644
--- a/components/python/python34/Makefile
+++ b/components/python/python34/Makefile
@@ -28,7 +28,7 @@
COMPONENT_NAME= Python
COMPONENT_VERSION= 3.4.9
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_PROJECT_URL= https://www.python.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
@@ -43,7 +43,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
# Need to preserve timestamp for Grammar files. If the pickle files are older,
# Python will try to rebuild them.
@@ -95,9 +94,6 @@
LDFLAGS.32 = -R/usr/gnu/lib -L/usr/gnu/lib
LDFLAGS.64 = -R/usr/gnu/lib/$(MACH64) -L/usr/gnu/lib/$(MACH64)
LDFLAGS += $(LDFLAGS.$(BITS))
-
-# Python puts its header files in a special place.
-LINT_FLAGS += -I$(SOURCE_DIR)/Include
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --enable-shared
diff --git a/components/python/python35/Makefile b/components/python/python35/Makefile
index 28245e6..0602358 100644
--- a/components/python/python35/Makefile
+++ b/components/python/python35/Makefile
@@ -30,6 +30,7 @@
COMPONENT_NAME= Python
COMPONENT_VERSION= 3.5.6
+COMPONENT_REVISION= 1
COMPONENT_PROJECT_URL= https://www.python.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
@@ -43,7 +44,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
# Need to preserve timestamp for Grammar files. If the pickle files are older,
# Python will try to rebuild them.
@@ -82,9 +82,6 @@
# add /usr/gnu/lib to the library search/run path
LDFLAGS.64 = -R/usr/gnu/lib/$(MACH64) -L/usr/gnu/lib/$(MACH64)
LDFLAGS += $(LDFLAGS.$(BITS))
-
-# Python puts its header files in a special place.
-LINT_FLAGS += -I$(SOURCE_DIR)/Include
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
CONFIGURE_OPTIONS += --enable-shared
diff --git a/components/text/tidy/Makefile b/components/text/tidy/Makefile
index 172acfd..cd1efb5 100644
--- a/components/text/tidy/Makefile
+++ b/components/text/tidy/Makefile
@@ -27,7 +27,7 @@
COMPONENT_NAME= tidy
COMPONENT_VERSION= 1.0.0
-COMPONENT_REVISION= 2
+COMPONENT_REVISION= 3
COMPONENT_PROJECT_URL= http://tidy.sourceforge.net/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
@@ -39,7 +39,6 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
-include $(WS_MAKE_RULES)/lint-libraries.mk
#tree.js, treeview.js, tidyenum_8h.html are installed
#from files directory manually as doxygen didn't generate them.
diff --git a/components/text/tidy/llib-ltidy b/components/text/tidy/llib-ltidy
deleted file mode 100644
index 51614bc..0000000
--- a/components/text/tidy/llib-ltidy
+++ /dev/null
@@ -1,36 +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 (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <sys/types.h>
-#include <tidy.h>
diff --git a/components/text/tidy/manifests/sample-manifest.p5m b/components/text/tidy/manifests/sample-manifest.p5m
index f39c7d8..6e849b5 100644
--- a/components/text/tidy/manifests/sample-manifest.p5m
+++ b/components/text/tidy/manifests/sample-manifest.p5m
@@ -33,12 +33,9 @@
link path=usr/lib/$(MACH64)/libtidy-1.0.so.0 target=libtidy-1.0.so.0.0.0
file path=usr/lib/$(MACH64)/libtidy-1.0.so.0.0.0
link path=usr/lib/$(MACH64)/libtidy.so target=libtidy-1.0.so.0.0.0
-file path=usr/lib/$(MACH64)/llib-ltidy.ln
link path=usr/lib/libtidy-1.0.so.0 target=libtidy-1.0.so.0.0.0
file path=usr/lib/libtidy-1.0.so.0.0.0
link path=usr/lib/libtidy.so target=libtidy-1.0.so.0.0.0
-file path=usr/lib/llib-ltidy
-file path=usr/lib/llib-ltidy.ln
file path=usr/share/doc/tidy/api/TidyNodeIter_8h_source.html
file path=usr/share/doc/tidy/api/access_8h_source.html
file path=usr/share/doc/tidy/api/annotated.html
diff --git a/components/text/tidy/tidy.p5m b/components/text/tidy/tidy.p5m
index 6933266..12e2d7b 100644
--- a/components/text/tidy/tidy.p5m
+++ b/components/text/tidy/tidy.p5m
@@ -86,12 +86,9 @@
link path=usr/lib/$(MACH64)/libtidy-1.0.so.0 target=libtidy-1.0.so.0.0.0
file path=usr/lib/$(MACH64)/libtidy-1.0.so.0.0.0
link path=usr/lib/$(MACH64)/libtidy.so target=libtidy-1.0.so.0.0.0
-file path=usr/lib/$(MACH64)/llib-ltidy.ln
link path=usr/lib/libtidy-1.0.so.0 target=libtidy-1.0.so.0.0.0
file path=usr/lib/libtidy-1.0.so.0.0.0
link path=usr/lib/libtidy.so target=libtidy-1.0.so.0.0.0
-file path=usr/lib/llib-ltidy
-file path=usr/lib/llib-ltidy.ln
file path=usr/share/doc/tidy/api/TidyNodeIter_8h_source.html
file path=usr/share/doc/tidy/api/access_8h_source.html
file path=usr/share/doc/tidy/api/annotated.html
diff --git a/components/web/curl/llib-lcurl b/components/web/curl/llib-lcurl
deleted file mode 100644
index 1eefc49..0000000
--- a/components/web/curl/llib-lcurl
+++ /dev/null
@@ -1,36 +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 (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
- */
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-/*
- * This little dance is necessary to avoid ftello/fseeko
- * complaints vs libc. We don't use them but we do #include
- * stdio.h and as we are large file aware they get defined
- * differently than libc.
- */
-#include <curl/curl.h>
-
diff --git a/make-rules/common.mk b/make-rules/common.mk
index 0de055c..e6eff38 100644
--- a/make-rules/common.mk
+++ b/make-rules/common.mk
@@ -99,15 +99,6 @@
endif # BUILD_BITS NO_ARCH
endif # BUILD_STYLE ant
-# Determine if we should automatically include lint libraries in build and
-# install targets based on presence of llib* files in component directory. This
-# must be done before defining any common targets since the include affects
-# later variable expansion.
-LINT_LIBRARIES ?= $(wildcard llib-*)
-ifneq ($(strip $(LINT_LIBRARIES)),)
-include $(WS_MAKE_RULES)/lint-libraries.mk
-endif
-
# Default targets; to omit a specific target, explicitly set the related target
# variable to empty before including this file or set COMMON_TARGETS=no.
COMMON_TARGETS ?= yes
diff --git a/make-rules/lint-libraries.mk b/make-rules/lint-libraries.mk
deleted file mode 100644
index ebb6ef2..0000000
--- a/make-rules/lint-libraries.mk
+++ /dev/null
@@ -1,68 +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 (c) 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# Rules and Macros for building lint libraries. This searches for lint
-# libraries in the component directory and adds targets to build and install
-# them for 32/64 bit.
-#
-# To use these rules, include $(WS_TOP)/make-rules/lint-libraries.mk in your
-# Makefile and add your lint library source in your component directory as
-# llib-l{lib}.
-#
-# Makefile
-# include $(WS_TOP)/make-rules/lint-libraries.mk
-#
-# llib-l{libname}
-#
-
-LINT_LIBRARIES = $(wildcard llib-*)
-
-LINT_FLAGS = -nsvx -I$(@D) -I$(SOURCE_DIR)/include -I$(SOURCE_DIR)
-
-# template for lint library rules. new rules will be added automatically
-define lintlib-rule
-$(BUILD_DIR_32)/$(1).ln: BITS=32
-$(BUILD_DIR_64)/$(1).ln: BITS=64
-
-$$(BUILD_DIR)/%/$(1).ln: $(1) $(BUILD_DIR)/%/.installed
- (cd $$(@D) ; $$(LINT) $$(LINT_FLAGS) -o $$(@F:llib-l%.ln=%) ../../$$<)
-
-$$(PROTOUSRLIBDIR)/$(1): $(1)
- $(INSTALL) -c $$< $$@
-
-$$(PROTOUSRLIBDIR)/$(1).ln: $$(BUILD_DIR)/$(MACH32)/$(1).ln
- $(INSTALL) -c $$< $$@
-
-$$(PROTOUSRLIBDIR64)/$(1).ln: $$(BUILD_DIR)/$(MACH64)/$(1).ln
- $(INSTALL) -c $$< $$@
-
-BUILD_32 += $(BUILD_DIR_32)/$(1).ln
-BUILD_64 += $(BUILD_DIR_64)/$(1).ln
-INSTALL_32 += $(PROTOUSRLIBDIR)/$(1)
-INSTALL_32 += $(PROTOUSRLIBDIR)/$(1).ln
-INSTALL_64 += $(PROTOUSRLIBDIR64)/$(1).ln
-endef
-
-# Generate the lint library rules from the above template
-$(foreach lintlib,$(LINT_LIBRARIES),$(eval $(call lintlib-rule,$(lintlib))))
--
Gitblit v1.9.3