expect: fix gcc-10 build

Aurelien Larcher

2020-05-24 613527d7b2d9e2349b8db16c0eb3c8e716f4f18f

expect: fix gcc-10 build

 components/tcl/expect/Makefile

@@ -24,21 +24,20 @@
# Copyright (c) 2018, Michal Nowak
#

BUILD_BITS=32_and_64
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        expect
COMPONENT_VERSION=    5.45.4
COMPONENT_REVISION=    1
COMPONENT_PROJECT_URL=    https://core.tcl.tk/expect/index
COMPONENT_SRC=        $(COMPONENT_NAME)$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH=    \
    sha256:49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
COMPONENT_ARCHIVE_URL=    http://sourceforge.net/projects/expect/files/Expect/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
COMPONENT_BUGDB=    utility/expect

include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
include $(WS_MAKE_RULES)/common.mk

SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
          passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
@@ -62,13 +61,6 @@
    '-ne "/Total/p"'

COMPONENT_TEST_TARGETS = test

# common targets
build:        $(BUILD_32_and_64)

install:    $(INSTALL_32_and_64) 
	
test:         $(TEST_32_and_64)

# special targets due to tcl internals dependencies
../tcl/build/%/.built:

 components/tcl/expect/patches/Makefile.in.patch

@@ -25,3 +25,17 @@
       else true; fi ; \
     done
 
--- expect5.45.4/Makefile.in.orig    2020-05-24 13:52:36.880881526 +0000
+++ expect5.45.4/Makefile.in    2020-05-24 13:52:53.755606483 +0000
@@ -148,9 +148,9 @@
 RANLIB        = @RANLIB@
 RANLIB_STUB    = @RANLIB_STUB@
 SHLIB_CFLAGS    = @SHLIB_CFLAGS@
-SHLIB_LD    = @SHLIB_LD@
+SHLIB_LD    = @SHLIB_LD@ @LDFLAGS_DEFAULT@
 SHLIB_LD_LIBS    = @SHLIB_LD_LIBS@
-STLIB_LD    = @STLIB_LD@
+STLIB_LD    = @STLIB_LD@ @LDFLAGS_DEFAULT@
 TCL_DEFS    = @TCL_DEFS@
 TCL_BIN_DIR    = @TCL_BIN_DIR@
 TCL_SRC_DIR    = @TCL_SRC_DIR@