Followup-For: Bug #930005
Control: tag -1 patch

The attached patch fixes the linking issue and thus the missing tgetent
symbol. Thereafter the command
  regina /usr/share/doc/regina-rexx/examples/regutil.rexx
works on i386, but segfaults on amd64.


Andreas
diff -Nru regina-rexx-3.6/debian/changelog regina-rexx-3.6/debian/changelog
--- regina-rexx-3.6/debian/changelog    2017-03-05 15:40:23.000000000 +0100
+++ regina-rexx-3.6/debian/changelog    2019-06-16 14:43:34.000000000 +0200
@@ -1,3 +1,12 @@
+regina-rexx (3.6-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * configure: Ensure the value of REGUTIL_TERM_LIB gets into the Makefile
+    s.t. we actually link against the library providing tgetent().
+    (Closes: #930005)
+
+ -- Andreas Beckmann <a...@debian.org>  Sun, 16 Jun 2019 14:43:34 +0200
+
 regina-rexx (3.6-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru regina-rexx-3.6/debian/patches/az-patch-01 
regina-rexx-3.6/debian/patches/az-patch-01
--- regina-rexx-3.6/debian/patches/az-patch-01  2012-06-30 15:21:18.000000000 
+0200
+++ regina-rexx-3.6/debian/patches/az-patch-01  2019-06-16 14:43:34.000000000 
+0200
@@ -10,8 +10,8 @@
 Forwarded: not-needed
 Bug-Debian: http://bugs.debian.org/661883
 
---- regina-rexx-3.6.orig/Makefile.in
-+++ regina-rexx-3.6/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -41,7 +41,7 @@ INSTALL  = $(srcdir)/install-sh
  CC  = @CC@
  RANLIB = @RANLIB@
@@ -21,6 +21,15 @@
  LDFLAGS = @LDFLAGS@
  
  RANLIB_DYNAMIC = @RANLIB_DYNAMIC@
+@@ -124,7 +124,7 @@ REGINAEXP = @REGINAEXP@
+ RPMTOPDIR = @RPMTOPDIR@
+ HAVE_GCI = @HAVE_GCI@
+ GCI_CONVERT_HEADER = @GCI_CONVERT_HEADER@
+-#REGUTIL_TERM_LIB=@REGUTIL_TERM_LIB@
++REGUTIL_TERM_LIB=@REGUTIL_TERM_LIB@
+ 
+ MISCDEFS = -DHAVE_CONFIG_H $(HAVE_GCI) $(TRACEMEM) $(FLISTS) -I. -I$(srcdir) 
-I$(srcdir)/contrib $(SYS_DEFS) $(REXXSOCKET)
+ LARGE_FILE_SUPPORT = @LARGE_FILE_SUPPORT@
 @@ -285,7 +285,8 @@ ZIP_CFILES = $(ZIP_CSRCFILES) yaccsrc.c
  DEBIANFILES = $(DEBIAN_DIR)/rules $(DEBIAN_DIR)/control 
$(DEBIAN_DIR)/changelog $(DEBIAN_DIR)/md5_sums \
        $(DEBIAN_DIR)/postinst $(DEBIAN_DIR)/postrm $(DEBIAN_DIR)/postrm-dev 
$(DEBIAN_DIR)/copyright
@@ -96,9 +105,17 @@
        $(INSTALL) -c -m 644 $(srcdir)/regina-config.1 
$(prefix)/share/man/man1/regina-config.1
  
  install-rexx: rexx$(EXE) regina$(EXE)
---- regina-rexx-3.6.orig/configure
-+++ regina-rexx-3.6/configure
-@@ -3445,7 +3445,7 @@ case "$target" in
+--- a/configure
++++ b/configure
+@@ -690,6 +690,7 @@ EFENCE
+ PURIFY
+ DEBUGGING
+ DEBUG
++REGUTIL_TERM_LIB
+ FNMATCH_TSO
+ FNMATCH_SHO
+ FNMATCH
+@@ -3445,7 +3446,7 @@ case "$target" in
        ;;
     *linux*|*kfreebsd*-gnu*)
        mach="`uname -m`"
@@ -107,7 +124,7 @@
           bitflag="64"
           osis64bit=yes
        fi
-@@ -8455,7 +8455,7 @@ case "$target" in
+@@ -8455,7 +8456,7 @@ case "$target" in
                  LD_RXLIB_B2="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                  LD_RXLIB_UTILB="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                  SHLPRE="lib"
@@ -116,9 +133,8 @@
                  SHL_BASE="${SHLPRE}${SHLFILE}${SHLPST}.\$(ABI)"
                  OTHER_INSTALLS="installabilib"
                  USE_ABI="yes"
-
---- regina-rexx-3.6.orig/regina.1
-+++ regina-rexx-3.6/regina.1
+--- a/regina.1
++++ b/regina.1
 @@ -60,13 +60,13 @@ Sets tracing of the program to the optio
  commands in the program will be ignored.
  If you want to run your program with tracing set to "Intermediate",
@@ -253,3 +269,13 @@
  
  .SH See Also
  There are several good reference books on Rexx. The most famous is
+--- a/configure.in
++++ b/configure.in
+@@ -249,6 +249,7 @@ if test "$REGUTIL_TERM_LIB" = "none requ
+   REGUTIL_TERM_LIB=""
+ fi
+ LIBS="$save_LIBS"
++AC_SUBST(REGUTIL_TERM_LIB)
+ 
+ save_LIBS="$LIBS"
+ 
AC_SEARCH_LIBS(crypt,crypt,REGINA_CRYPT_LIB="$ac_cv_search_crypt",REGINA_CRYPT_LIB="")

Reply via email to