pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add support for svr5/UnixWare, Fix linking issue with OpenServer 5.



Module Name:	pkgsrc-wip
Committed By:	Boyd Lynn Gerber <gerberb%zenez.com@localhost>
Pushed By:	gerberb
Date:		Wed Jun 8 06:04:10 2022 -0600
Changeset:	70669d5872cd6dfedcbf46ac481685cc43c4ee98

Modified Files:
	tcl-expect/patches/patch-tclconfig_tcl.m4

Log Message:
Add support for svr5/UnixWare, Fix linking issue with OpenServer 5.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=70669d5872cd6dfedcbf46ac481685cc43c4ee98

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tcl-expect/patches/patch-tclconfig_tcl.m4 | 50 ++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 18 deletions(-)

diffs:
diff --git a/tcl-expect/patches/patch-tclconfig_tcl.m4 b/tcl-expect/patches/patch-tclconfig_tcl.m4
index 0a4e26abb6..750de32f59 100644
--- a/tcl-expect/patches/patch-tclconfig_tcl.m4
+++ b/tcl-expect/patches/patch-tclconfig_tcl.m4
@@ -6,8 +6,12 @@ $NetBSD$
 # Emailed Upstream September 2019
 
 --- tclconfig/tcl.m4.orig	2018-02-04 06:55:43.000000000 +0000
-+++ tclconfig/tcl.m4	2022-04-30 09:18:53.837696001 +0000
-@@ -1817,16 +1817,42 @@
++++ tclconfig/tcl.m4	2022-06-07 08:37:43.412809932 -0600
+@@ -1814,19 +1814,47 @@
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;
+ 	SCO_SV-3.2*)
++	    # fix SCO OpenServer 5 linking with gcc
  	    AS_IF([test "$GCC" = yes], [
  		SHLIB_CFLAGS="-fPIC -melf"
  		LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
@@ -24,6 +28,7 @@ $NetBSD$
  	    LD_SEARCH_FLAGS=""
  	    ;;
 +       UnixWare-5*|SCO_SV-5*)
++	    # Add UnixWare 
 +            # -Kthread will define _REENTRANT
 +            AS_IF([test "$GCC" = yes], [
 +                SHLIB_CFLAGS="-fPIC"
@@ -51,25 +56,34 @@ $NetBSD$
  	SunOS-5.[[0-6]])
  	    # Careful to not let 5.10+ fall into this case
  
-@@ -1968,9 +1994,10 @@
- 	    BSD/OS*) ;;
- 	    CYGWIN_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
+@@ -1961,6 +1989,7 @@
+     # If we're running gcc, then change the C flags for compiling shared
+     # libraries to the right flags for gcc, instead of those for the
+     # standard manufacturer compiler.
++    # Add UnixWare to the list of $systems needing -fPIC
+ 
+     AS_IF([test "$GCC" = yes], [
+ 	case $system in
+@@ -1971,6 +2000,7 @@
+ 	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
 +	    UnixWare-5*|SCO_SV-3.5*) ;;
  	    windows) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
  	esac])
-@@ -3212,6 +3239,9 @@
-     # substituted. (@@@ Might not be necessary anymore)
-     #--------------------------------------------------------------------
- 
-+    PVNODOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-+    SHARED_LIB_SUFFIX=${PVNODOTS}.so
-+    UNSHARED_LIB_SUFFIX=${PVNODOTS}.a
-     if test "${TEA_PLATFORM}" = "windows" ; then
- 	if test "${SHARED_BUILD}" = "1" ; then
- 	    # We force the unresolved linking of symbols that are really in
+ 	    AS_IF([test "$GCC" = yes], [
+ 		SHLIB_CFLAGS="-fPIC -melf"
+ 		LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
++	        SHLIB_LD="gcc"
+ 	    ], [
+ 	       SHLIB_CFLAGS="-Kpic -belf"
+ 	       LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+-	    ])
+ 	    SHLIB_LD="ld -G"
++	    ])
+ 	    SHLIB_LD_LIBS=""
+ 	    SHLIB_SUFFIX=".so"
+ 	    CC_SEARCH_FLAGS=""
+ 	    LD_SEARCH_FLAGS=""
+ 	    ;;


Home | Main Index | Thread Index | Old Index