From 6ca8c2ef2bffdfec8cc95c049ac3f2230dc6ca82 Mon Sep 17 00:00:00 2001 From: Till Wegmüller <toasterson@gmail.com> Date: Sun, 07 Apr 2024 19:19:55 +0200 Subject: [PATCH] component(library/readline): Update to 8.2.10 with 6.3 as new compat --- components/library/readline/Makefile | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/components/library/readline/Makefile b/components/library/readline/Makefile index b481827..c55f33a 100644 --- a/components/library/readline/Makefile +++ b/components/library/readline/Makefile @@ -23,30 +23,30 @@ # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # -BUILD_BITS= 32_and_64 +BUILD_BITS= 64_and_32 include ../../../make-rules/shared-macros.mk COMPONENT_NAME= readline -COMPONENT_VERSION= 6.3 -COMPONENT_REVISION= 7 +COMPONENT_VERSION= 8.2 COMPONENT_SUMMARY= GNU readline provides interactive line-editing and history COMPONENT_DESCRIPTION= The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in -COMPONENT_PROJECT_URL= https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html +COMPONENT_PROJECT_URL= https://tiswww.cwru.edu/php/chet/readline/rltop.html COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 +COMPONENT_ARCHIVE_HASH= sha256:08835e57b5eb84f07f8fa50c7530e4b13b08265ffef340e4a4cce4ad6fb575fe COMPONENT_ARCHIVE_URL= https://ftp.gnu.org/gnu/readline/$(COMPONENT_ARCHIVE) COMPONENT_FMRI= library/readline COMPONENT_CLASSIFICATION= System/Libraries COMPONENT_LICENSE= GPLv2, GPLv3, FDLv1.3 +COMPONENT_LICENSE_FILE= COPYING # For now, we want to continue to provide the libreadline and libhistory so's # (and their links) from readline 5.2. # -COMPONENT_VERSION_1= 5.2 +COMPONENT_VERSION_1= 6.3 COMPONENT_SRC_1= $(COMPONENT_NAME)-$(COMPONENT_VERSION_1) COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1).tar.gz -COMPONENT_ARCHIVE_HASH_1= sha256:12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 +COMPONENT_ARCHIVE_HASH_1= sha256:56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 COMPONENT_ARCHIVE_URL_1= https://ftp.gnu.org/gnu/readline/$(COMPONENT_ARCHIVE_1) SOURCE_DIR_1= $(COMPONENT_DIR)/$(COMPONENT_SRC_1) @@ -69,21 +69,17 @@ COMPONENT_TEST_TARGETS= # Needed to build the test program. -COMPONENT_PRE_SYSTEM_TEST_ACTION += \ +COMPONENT_PRE_TEST_ACTION += \ (cd $(@D) ; $(GMAKE) libreadline.a ) ; # Build the test program. -COMPONENT_PRE_SYSTEM_TEST_ACTION += \ +COMPONENT_PRE_TEST_ACTION += \ (cd $(@D)/examples ; $(GMAKE) rlcat ) ; # Get correct libreadline.so.6 from the proto area. TEST_LIBPATH.32= $(PROTOUSRLIBDIR) TEST_LIBPATH.64= $(PROTOUSRLIBDIR64) COMPONENT_TEST_ENV += LD_LIBRARY_PATH=$(TEST_LIBPATH.$(BITS)) - -COMPONENT_SYSTEM_TEST_DIR= $(@D)/examples -COMPONENT_SYSTEM_TEST_CMD= $(CAT) $(SOURCE_DIR)/examples/Inputrc | ./rlcat -COMPONENT_SYSTEM_TEST_TARGETS= # Macros to configure, build, and install the old version for the time being. BUILD_OLD_DIR_32= $(COMPONENT_DIR)/build/$(COMPONENT_VERSION_1)-$(MACH32) @@ -106,7 +102,7 @@ ASLR_MODE= $(ASLR_NOT_APPLICABLE) -test: install $(TEST_32_and_64) +test: install $(TEST_64_and_32) # Auto-generated dependencies REQUIRED_PACKAGES += system/library -- Gitblit v1.9.3