Skip to contentSkip to conversation

expect: new package 5.45

PATCH Superseded Andrew Ruder 4 participants 5 messages Apr 9, 2014 – Apr 10, 2014

lore
Share & tools
lore

Andrew Ruder

author
#0 lore raw

PATCH v2 1/1 expect: new package 5.45

Signed-off-by Andrew Ruder <[email protected]>

---
A few changes from the last time:

. Removed the dependencies in BR2_PACKAGE_EXPECT Config.in
since it is taken care of by the BR2_PACKAGE_TCL.

. Split the patch into two (one for each notional change) and
added git-style headers to each patch.

 package/Config.in                                  |   1 +
 package/expect/Config.in                           |   7 ++
 .../expect-0001-enable-cross-compilation.patch     | 120 +++++++++++++++++++++
 .../expect-0002-allow-tcl-build-directory.patch    |  34 ++++++
 package/expect/expect.mk                           |  21 ++++
 5 files changed, 183 insertions(+)
 create mode 100644 package/expect/Config.in
 create mode 100644 package/expect/expect-0001-enable-cross-compilation.patch
 create mode 100644 package/expect/expect-0002-allow-tcl-build-directory.patch
 create mode 100644 package/expect/expect.mk
package/Config.in +1 -0
index 72d529c..6abc7b3 100644
@@ -477,6 +477,7 @@ source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 if BR2_PACKAGE_TCL
 menu "tcl libraries/modules"
+source "package/expect/Config.in"
 source "package/tcllib/Config.in"
 endmenu
 endif
package/expect/Config.in new file +7 -0
new file mode 100644
index 0000000..5557f4a
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_EXPECT
+	bool "expect"
+	help
+	  Expect is a tool for automating interactive applications
+	  such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc.
+
+	  http://expect.sourceforge.net/
package/expect/expect-0001-enable-cross-compilation.patch new file +120 -0

120 lines not on this page · raw message

package/expect/expect-0002-allow-tcl-build-directory.patch new file +34 -0
new file mode 100644
index 0000000..83ede7a
@@ -0,0 +1,34 @@
+From: Andrew Ruder <[email protected]>
+Subject: [PATCH] Allow tcl build directory for linking
+
+Some small changes to use TCL_BUILD_LIB_SPEC instead of TCL_LIB_SPEC for
+linking against tcl directly out of its build directory.
+
+Signed-off-by: Andrew Ruder <[email protected]>
+---
+
+Index: expect-5.45/Makefile.in
+===================================================================
+--- expect-5.45.orig/Makefile.in	2013-11-14 07:59:58.732100595 -0600
++++ expect-5.45/Makefile.in	2013-11-14 07:59:58.732100595 -0600
+@@ -393,7 +393,7 @@
+ 		@LDFLAGS_DEFAULT@ \
+ 		-o expect exp_main_exp.o \
+ 		@EXP_BUILD_LIB_SPEC@ \
+-		@TCL_LIB_SPEC@ \
++		@TCL_BUILD_LIB_SPEC@ \
+ 		@TCL_DL_LIBS@ @PKG_LIBS@ @MATH_LIBS@ \
+ 		@TCL_CC_SEARCH_FLAGS@ \
+ 		@EXP_CC_SEARCH_FLAGS@
+Index: expect-5.45/tclconfig/tcl.m4
+===================================================================
+--- expect-5.45.orig/tclconfig/tcl.m4	2010-11-09 13:42:10.000000000 -0600
++++ expect-5.45/tclconfig/tcl.m4	2013-11-14 08:02:08.424100580 -0600
+@@ -412,6 +412,7 @@
+     AC_SUBST(TCL_LIB_FILE)
+     AC_SUBST(TCL_LIB_FLAG)
+     AC_SUBST(TCL_LIB_SPEC)
++    AC_SUBST(TCL_BUILD_LIB_SPEC)
+ 
+     AC_SUBST(TCL_STUB_LIB_FILE)
+     AC_SUBST(TCL_STUB_LIB_FLAG)
package/expect/expect.mk new file +21 -0
new file mode 100644
index 0000000..91fa019
@@ -0,0 +1,21 @@
+################################################################################
+#
+# expect
+#
+################################################################################
+
+EXPECT_VERSION = 5.45
+EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
+EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)
+EXPECT_LICENSE = Public domain
+EXPECT_LICENSE_FILES = README
+
+EXPECT_AUTORECONF = YES
+EXPECT_DEPENDENCIES = tcl
+EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+
+# Since we don't want examples installed
+EXPECT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR)  install-binaries
+
+$(eval $(autotools-package))
+
Signature · 1 line
1.9.0.rc3.12.gbc97e2d
#1 lore raw

PATCH v2 1/1 expect: new package 5.45

Hi Andrew,

Andrew Ruder <[email protected]> schreef:

Quoted 9 lines
Signed-off-by Andrew Ruder <[email protected]>

---
A few changes from the last time:

. Removed the dependencies in BR2_PACKAGE_EXPECT Config.in
since it is taken care of by the BR2_PACKAGE_TCL.

. Split the patch into two (one for each notional change) and
added git-style headers to each patch.

....

Quoted 6 lines
package/expect/expect.mk new file +0 -0
new file mode 100644
index 0000000..91fa019

package/expect/expect.mk line 9

Quoted 9 lines
package/expect/expect.mk new file +9 -0
@@ -0,0 +1,21 @@
+################################################################################
+#
+# expect
+#
+################################################################################
+
+EXPECT_VERSION = 5.45
+EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
+EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)

I don't have the sources available right now, but don't we have a variable that points to sourceforge? BR2_SOURCEFORGE_MIRROR I thought...

package/expect/expect.mk line 21

Quoted 12 lines
package/expect/expect.mk new file +12 -0
+EXPECT_LICENSE = Public domain
+EXPECT_LICENSE_FILES = README
+
+EXPECT_AUTORECONF = YES
+EXPECT_DEPENDENCIES = tcl
+EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+
+# Since we don't want examples installed
+EXPECT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR)  install-binaries
+
+$(eval $(autotools-package))
+

This last empty line should be removed. (nitpick)

Best regards,
Thomas

author
#2 lore raw

PATCH v3 1/1 expect: new package 5.45

Signed-off-by Andrew Ruder <[email protected]>
Cc Thomas De Schampheleire <[email protected]>

---

Changes from v2:
Extra line at the end? I can handle this :)

 package/Config.in                                  |   1 +
 package/expect/Config.in                           |   7 ++
 .../expect-0001-enable-cross-compilation.patch     | 120 +++++++++++++++++++++
 .../expect-0002-allow-tcl-build-directory.patch    |  34 ++++++
 package/expect/expect.mk                           |  20 ++++
 5 files changed, 182 insertions(+)
 create mode 100644 package/expect/Config.in
 create mode 100644 package/expect/expect-0001-enable-cross-compilation.patch
 create mode 100644 package/expect/expect-0002-allow-tcl-build-directory.patch
 create mode 100644 package/expect/expect.mk
package/Config.in +1 -0
index 72d529c..6abc7b3 100644
@@ -477,6 +477,7 @@ source "package/ruby/Config.in"
 source "package/tcl/Config.in"
 if BR2_PACKAGE_TCL
 menu "tcl libraries/modules"
+source "package/expect/Config.in"
 source "package/tcllib/Config.in"
 endmenu
 endif
package/expect/Config.in new file +7 -0
new file mode 100644
index 0000000..5557f4a
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_EXPECT
+	bool "expect"
+	help
+	  Expect is a tool for automating interactive applications
+	  such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc.
+
+	  http://expect.sourceforge.net/
package/expect/expect-0001-enable-cross-compilation.patch new file +120 -0

120 lines not on this page · raw message

package/expect/expect-0002-allow-tcl-build-directory.patch new file +34 -0
new file mode 100644
index 0000000..83ede7a
@@ -0,0 +1,34 @@
+From: Andrew Ruder <[email protected]>
+Subject: [PATCH] Allow tcl build directory for linking
+
+Some small changes to use TCL_BUILD_LIB_SPEC instead of TCL_LIB_SPEC for
+linking against tcl directly out of its build directory.
+
+Signed-off-by: Andrew Ruder <[email protected]>
+---
+
+Index: expect-5.45/Makefile.in
+===================================================================
+--- expect-5.45.orig/Makefile.in	2013-11-14 07:59:58.732100595 -0600
++++ expect-5.45/Makefile.in	2013-11-14 07:59:58.732100595 -0600
+@@ -393,7 +393,7 @@
+ 		@LDFLAGS_DEFAULT@ \
+ 		-o expect exp_main_exp.o \
+ 		@EXP_BUILD_LIB_SPEC@ \
+-		@TCL_LIB_SPEC@ \
++		@TCL_BUILD_LIB_SPEC@ \
+ 		@TCL_DL_LIBS@ @PKG_LIBS@ @MATH_LIBS@ \
+ 		@TCL_CC_SEARCH_FLAGS@ \
+ 		@EXP_CC_SEARCH_FLAGS@
+Index: expect-5.45/tclconfig/tcl.m4
+===================================================================
+--- expect-5.45.orig/tclconfig/tcl.m4	2010-11-09 13:42:10.000000000 -0600
++++ expect-5.45/tclconfig/tcl.m4	2013-11-14 08:02:08.424100580 -0600
+@@ -412,6 +412,7 @@
+     AC_SUBST(TCL_LIB_FILE)
+     AC_SUBST(TCL_LIB_FLAG)
+     AC_SUBST(TCL_LIB_SPEC)
++    AC_SUBST(TCL_BUILD_LIB_SPEC)
+ 
+     AC_SUBST(TCL_STUB_LIB_FILE)
+     AC_SUBST(TCL_STUB_LIB_FLAG)
package/expect/expect.mk new file +20 -0
new file mode 100644
index 0000000..81e1d54
@@ -0,0 +1,20 @@
+################################################################################
+#
+# expect
+#
+################################################################################
+
+EXPECT_VERSION = 5.45
+EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
+EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)
+EXPECT_LICENSE = Public domain
+EXPECT_LICENSE_FILES = README
+
+EXPECT_AUTORECONF = YES
+EXPECT_DEPENDENCIES = tcl
+EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+
+# Since we don't want examples installed
+EXPECT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR)  install-binaries
+
+$(eval $(autotools-package))
Signature · 1 line
1.9.0.rc3.12.gbc97e2d
#4 lore raw

PATCH v2 1/1 expect: new package 5.45

In reply to Thomas De Schampheleire

Dear Thomas De Schampheleire,

Quoted 3 lines · Thomas De Schampheleire
Quoted 1 line

+EXPECT_SITE = http://downloads.sourceforge.net/project/expect/Expect/$(EXPECT_VERSION)

I don't have the sources available right now, but don't we have a variable that points to sourceforge? BR2_SOURCEFORGE_MIRROR I thought...

No, we removed it. This is because downloads.sourceforge.net already does the balancing across the mirrors.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com