[pkgsrc/trunk]: pkgsrc/mk libtool 1.5.2nb7: Another Interix fix, this time re...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mk libtool 1.5.2nb7: Another Interix fix, this time re...
From: tv <tv%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:57:15 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/96c1bac276c3
branches:  trunk
changeset: 473598:96c1bac276c3
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Apr 21 14:55:32 2004 +0000

description:
libtool 1.5.2nb7: Another Interix fix, this time removing any usage of
-fpic or -fPIC, as those produce horribly broken code.  Rather, shlibs
are relocated at runtime by the NT loader, and are compiled without any
special PIC option.

diffstat:

 devel/libtool/Makefile.common           |    4 +-
 devel/libtool/distinfo                  |    6 +-
 devel/libtool/patches/manual-libtool.m4 |   45 +-
 devel/libtool/patches/manual.README     |   26 +-
 devel/libtool/patches/patch-ab          |  229 ++++++----
 devel/libtool/patches/patch-ad          |  639 ++++++++++++++++---------------
 mk/defs.Interix.mk                      |    4 +-
 7 files changed, 530 insertions(+), 423 deletions(-)

diffs (truncated from 2110 to 300 lines):

diff -r 46b3109f2fc6 -r 96c1bac276c3 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common     Wed Apr 21 14:53:51 2004 +0000
+++ b/devel/libtool/Makefile.common     Wed Apr 21 14:55:32 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.49 2004/04/20 18:29:34 tv Exp $
+# $NetBSD: Makefile.common,v 1.50 2004/04/21 14:55:32 tv Exp $
 #
 
 DISTNAME=      libtool-1.5.2
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    devel pkgtools
 MASTER_SITES=  ${MASTER_SITE_GNU:=libtool/}
 
diff -r 46b3109f2fc6 -r 96c1bac276c3 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Wed Apr 21 14:53:51 2004 +0000
+++ b/devel/libtool/distinfo    Wed Apr 21 14:55:32 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.39 2004/04/20 18:29:34 tv Exp $
+$NetBSD: distinfo,v 1.40 2004/04/21 14:55:32 tv Exp $
 
 SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
 Size (libtool-1.5.2.tar.gz) = 2653072 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 92eb9d9cd825a329172e108fdaa2d2cc68821838
+SHA1 (patch-ab) = ef15cd8d1436719d2c4715ceb139474ce3e81a30
 SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715
-SHA1 (patch-ad) = 26171c5184660fa18b9160ed2313617e90fb7cac
+SHA1 (patch-ad) = 2fdd8d3bd276bdadf25811b5b102c823adeced34
diff -r 46b3109f2fc6 -r 96c1bac276c3 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Wed Apr 21 14:53:51 2004 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Wed Apr 21 14:55:32 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.2 2004/04/21 14:55:32 tv Exp $
 
 --- libtool.m4.orig    Fri Jan 23 01:07:04 2004
 +++ libtool.m4
@@ -39,13 +39,13 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
-+interix*)
++interix3*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix ld.so'
++  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
@@ -104,7 +104,7 @@
    esac
    ;;
  
-+interix*)
++interix3*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
 +  ;;
 +
@@ -115,7 +115,7 @@
        ;;
      esac
      ;;
-+  interix*)
++  interix3*)
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -162,20 +162,43 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4643,6 +4677,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4579,6 +4613,10 @@ AC_MSG_CHECKING([for $compiler option to
+       ;;
+       esac
+       ;;
++    interix3*)
++      # Interix 3.0-3.5 -fPIC option generates borked code.
++      # (Instead, shlibs are relocated at runtime.)
++      ;;
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+@@ -4643,6 +4681,8 @@ AC_MSG_CHECKING([for $compiler option to
            ;;
        esac
        ;;
-+      interix*)
++      interix3*)
 +      ;;
        irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
-@@ -5131,6 +5167,11 @@ EOF
+@@ -4839,6 +4879,11 @@ AC_MSG_CHECKING([for $compiler option to
+       esac
+       ;;
+ 
++    interix3*)
++      # Interix 3.0-3.5 -fPIC option generates borked code.
++      # (Instead, shlibs are relocated at runtime.)
++      ;;
++
+     *)
+       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+@@ -5131,6 +5176,11 @@ EOF
        fi
        ;;
  
-+    interix*)
++    interix3*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
 +      ;;
@@ -183,13 +206,13 @@
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -5534,6 +5575,14 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5534,6 +5584,14 @@ $echo "local: *; };" >> $output_objdir/$
          ;;
        esac
        fi
 +      ;;
 +
-+    interix*)
++    interix3*)
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
diff -r 46b3109f2fc6 -r 96c1bac276c3 devel/libtool/patches/manual.README
--- a/devel/libtool/patches/manual.README       Wed Apr 21 14:53:51 2004 +0000
+++ b/devel/libtool/patches/manual.README       Wed Apr 21 14:55:32 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual.README,v 1.2 2004/04/21 13:55:19 tv Exp $
+$NetBSD: manual.README,v 1.3 2004/04/21 14:55:32 tv Exp $
 
 The "manual-*" patch files are used to maintain the pkgsrc version of
 libtool.  These files contain patches for the .m4 files in libtool which are
@@ -11,21 +11,21 @@
 
 =====
 
-$ cd /usr/pkgsrc/devel/libtool-base
-$ make configure
-$ cd work*/libtool-*
-$ cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s
+cd /usr/pkgsrc/devel/libtool-base
+make configure
+cd work*/libtool-*
+cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s
 
 [edit *.m4 files and put patches back to manual-*]
 
-$ make ./configure
-$ pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
-$ cp -f acinclude.m4 libltdl/
-$ (cd libltdl && make ./configure)
-$ pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
-$ cd /usr/pkgsrc/devel/libtool
-$ make makepatchsum
-$ cvs commit
+make ./configure
+pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
+cp -f acinclude.m4 libltdl/
+(cd libltdl && make ./configure)
+pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
+cd /usr/pkgsrc/devel/libtool
+make makepatchsum
+cvs commit
 
 =====
 
diff -r 46b3109f2fc6 -r 96c1bac276c3 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Wed Apr 21 14:53:51 2004 +0000
+++ b/devel/libtool/patches/patch-ab    Wed Apr 21 14:55:32 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $
+$NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $
 
 --- configure.orig     Sun Jan 25 07:36:38 2004
 +++ configure
@@ -193,7 +193,7 @@
    esac
    ;;
  
-+interix*)
++interix3*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
 +  ;;
 +
@@ -240,11 +240,23 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7243,6 +7270,11 @@ EOF
+@@ -6868,6 +6895,11 @@ echo $ECHO_N "checking for $compiler opt
+       esac
+       ;;
+ 
++    interix3*)
++      # Interix 3.0-3.5 -fPIC option generates borked code.
++      # (Instead, shlibs are relocated at runtime.)
++      ;;
++
+     *)
+       lt_prog_compiler_pic='-fPIC'
+       ;;
+@@ -7243,6 +7275,11 @@ EOF
        fi
        ;;
  
-+    interix*)
++    interix3*)
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
 +      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
 +      ;;
@@ -252,7 +264,7 @@
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7457,7 +7489,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7457,7 +7494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -262,7 +274,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7517,7 +7550,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7517,7 +7555,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -272,11 +284,11 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7748,6 +7782,14 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7748,6 +7787,14 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
-+    interix*)
++    interix3*)
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
 +      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@@ -287,7 +299,7 @@
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
-@@ -8136,8 +8178,9 @@ beos*)
+@@ -8136,8 +8183,9 @@ beos*)
    ;;
  
  bsdi4*)
@@ -298,7 +310,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8253,15 +8296,15 @@ kfreebsd*-gnu)
+@@ -8253,15 +8301,15 @@ kfreebsd*-gnu)
  
  freebsd*)
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -320,17 +332,17 @@
        need_version=yes
        ;;
    esac
-@@ -8337,15 +8380,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8337,15 +8385,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
-+interix*)
++interix3*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix ld.so'
++  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
@@ -349,7 +361,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8381,7 +8431,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8381,7 +8436,7 @@ linux*oldld* | linux*aout* | linux*coff*
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of anjuta to 1.2.2.
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/texi2html Bl3ify and enable pkgviews installa...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of anjuta to 1.2.2.
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/texi2html Bl3ify and enable pkgviews installa...
Indexes:
Home | Main Index | Thread Index | Old Index