X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftcl;h=bb2e3cdadc56c4bd790ba4f26e1afeaf21c94b8e;hp=a62b4e6b052101953bad19b923a46e70ba27ef99;hb=HEAD;hpb=6a0328658a0a3ca9b9bcdb95aedc427ebd5196ae diff --git a/lfs/tcl b/lfs/tcl index a62b4e6b05..05cf99aa6b 100644 --- a/lfs/tcl +++ b/lfs/tcl @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,14 +24,14 @@ include Config -VER = 8.4.13 +VER = 8.6.14 THISAPP = tcl$(VER) DL_FILE = $(THISAPP)-src.tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(LFS_PASS)" "toolchain" +ifneq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP)-tools else TARGET = $(DIR_INFO)/$(THISAPP) @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c6b655ad5db095ee73227113220c0523 +$(DL_FILE)_BLAKE2 = 7089747a4d539b46e710ecb795aa3cd5576243862fae3cf8e6f0efb15681174881396c0147071dca18421d9d95eb35557b17d623f0f63383476fe882cef35a61 install : $(TARGET) @@ -53,10 +53,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects)) download :$(patsubst %,$(DIR_DL)/%,$(objects)) -md5 : $(subst %,%_MD5,$(objects)) +b2 : $(subst %,%_BLAKE2,$(objects)) ############################################################################### -# Downloading, checking, md5sum +# Downloading, checking, b2sum ############################################################################### $(patsubst %,$(DIR_CHK)/%,$(objects)) : @@ -65,8 +65,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) : $(patsubst %,$(DIR_DL)/%,$(objects)) : @$(LOAD) -$(subst %,%_MD5,$(objects)) : - @$(MD5) +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) ############################################################################### # Installation Details @@ -75,18 +75,14 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(LFS_PASS)" "toolchain" - cd $(DIR_APP)/unix && ./configure --prefix=/tools --disable-nls -else - cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls -endif + cd $(DIR_APP)/unix && ./configure --prefix=$(PREFIX) cd $(DIR_APP)/unix && make $(MAKETUNING) cd $(DIR_APP)/unix && make install -ifeq "$(LFS_PASS)" "toolchain" +ifneq "$(ROOT)" "" cd $(DIR_APP)/unix && make install-private-headers - ln -sf tclsh8.4 /tools/bin/tclsh + ln -sf tclsh8.6 $(TOOLS_DIR)/bin/tclsh else - ln -sf tclsh8.4 /usr/bin/tclsh + ln -sf tclsh8.6 /usr/bin/tclsh endif @rm -rf $(DIR_APP) @$(POSTBUILD)