[pkgsrc/trunk]: pkgsrc/devel PR 40405: Change soname logic for DragonFly to f...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4673cca3e3f9
branches:  trunk
changeset: 556620:4673cca3e3f9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Mar 23 23:03:58 2009 +0000

description:
PR 40405: Change soname logic for DragonFly to follow the normal major
only scheme. Properly distinguish FreeBSD and DragonFly case to prevent
further confusion. Differs from the patch in the PR as it forces the
correct branch to be used.

Bump revision of libtool-base. Claim ownership.

diffstat:

 devel/libtool-base/Makefile             |    3 +-
 devel/libtool/Makefile.common           |    4 +-
 devel/libtool/distinfo                  |    6 +-
 devel/libtool/patches/manual-libtool.m4 |   92 ++++++++------
 devel/libtool/patches/patch-ab          |  194 +++++++++++++++++++------------
 devel/libtool/patches/patch-ad          |  200 +++++++++++++++++++------------
 6 files changed, 300 insertions(+), 199 deletions(-)

diffs (truncated from 1728 to 300 lines):

diff -r 52caf518e71e -r 4673cca3e3f9 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Mon Mar 23 18:30:44 2009 +0000
+++ b/devel/libtool-base/Makefile       Mon Mar 23 23:03:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2008/11/19 07:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2009/03/23 23:03:59 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,6 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
+PKGREVISION=   1
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r 52caf518e71e -r 4673cca3e3f9 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common     Mon Mar 23 18:30:44 2009 +0000
+++ b/devel/libtool/Makefile.common     Mon Mar 23 23:03:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2008/11/19 01:26:52 chuck Exp $
+# $NetBSD: Makefile.common,v 1.74 2009/03/23 23:03:58 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -27,7 +27,7 @@
 CATEGORIES=    devel pkgtools
 MASTER_SITES=  ${MASTER_SITE_GNU:=libtool/}
 
-MAINTAINER=    joerg%NetBSD.org@localhost
+OWNER=         joerg%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/libtool/libtool.html
 #LICENSE=      gnu-gpl-v2
 
diff -r 52caf518e71e -r 4673cca3e3f9 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Mon Mar 23 18:30:44 2009 +0000
+++ b/devel/libtool/distinfo    Mon Mar 23 23:03:58 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: distinfo,v 1.73 2009/03/23 23:03:59 joerg Exp $
 
 SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
 RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
 Size (libtool-1.5.26.tar.gz) = 2961939 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 4b3befd3cf5629e3b46b4bd100b697d10089d434
+SHA1 (patch-ab) = 9902ccf15b031d04fdca95acbf718a849c6d0a4f
 SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
-SHA1 (patch-ad) = d3636017fc09a571df6ecb57b7b988867bbbd4ce
+SHA1 (patch-ad) = e3e3164b1e9598deab233450a1f7a8262dd09d66
diff -r 52caf518e71e -r 4673cca3e3f9 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Mon Mar 23 18:30:44 2009 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Mon Mar 23 23:03:58 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.24 2009/02/24 10:13:26 abs Exp $
+$NetBSD: manual-libtool.m4,v 1.25 2009/03/23 23:03:59 joerg Exp $
 
 Local pkgsrc changes:
 - override the basename to point to the actual backend compiler,
@@ -8,10 +8,11 @@
 - QNX support
 - Interix3 support
 - disable static linkage on OS X by default
+- DragonFly support decoupled from FreeBSD
 
---- libtool.m4.orig    2008-02-01 16:26:47.000000000 +0000
-+++ libtool.m4 2009-02-21 23:20:30.000000000 +0000
-@@ -249,7 +249,10 @@
+--- libtool.m4.orig    2008-02-01 17:26:47.000000000 +0100
++++ libtool.m4
+@@ -249,7 +249,10 @@ AC_DEFUN([_LT_CC_BASENAME],
      *) break;;
    esac
  done
@@ -23,7 +24,7 @@
  ])
  
  
-@@ -474,11 +477,11 @@
+@@ -474,11 +477,11 @@ else
  
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
@@ -37,7 +38,7 @@
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
         test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -820,6 +823,13 @@
+@@ -820,6 +823,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -51,7 +52,7 @@
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-@@ -1427,6 +1437,7 @@
+@@ -1427,6 +1437,7 @@ beos*)
  bsdi[[45]]*)
    version_type=linux
    need_version=no
@@ -59,16 +60,18 @@
    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'
-@@ -1525,7 +1536,7 @@
+@@ -1525,9 +1536,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
 -freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
 +freebsd*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -1539,7 +1550,7 @@
+     objformat=`/usr/bin/objformat`
+   else
+@@ -1539,7 +1548,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -77,15 +80,24 @@
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -1569,6 +1580,16 @@
+@@ -1562,13 +1571,24 @@ freebsd* | dragonfly*)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+-  *) # from 4.6 on, and DragonFly
++  *) # from 4.6 on
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+     ;;
    esac
    ;;
  
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
@@ -94,7 +106,7 @@
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -1637,15 +1658,22 @@
+@@ -1637,15 +1657,22 @@ interix[[3-9]]*)
    hardcode_into_libs=yes
    ;;
  
@@ -123,7 +135,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1710,11 +1738,11 @@
+@@ -1710,11 +1737,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -137,7 +149,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -1739,13 +1767,14 @@
+@@ -1739,13 +1766,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -153,7 +165,7 @@
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1753,7 +1782,7 @@
+@@ -1753,7 +1781,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -162,7 +174,7 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1954,9 +1983,7 @@
+@@ -1954,9 +1982,7 @@ if test -f "$ltmain" && test -n "$tagnam
  
        case $tagname in
        CXX)
@@ -173,7 +185,7 @@
          AC_LIBTOOL_LANG_CXX_CONFIG
        else
          tagname=""
-@@ -2475,6 +2502,10 @@
+@@ -2475,6 +2501,10 @@ interix[[3-9]]*)
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
    ;;
  
@@ -184,7 +196,7 @@
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -2505,7 +2536,7 @@
+@@ -2505,7 +2535,7 @@ newos6*)
    ;;
  
  nto-qnx*)
@@ -193,7 +205,7 @@
    ;;
  
  openbsd*)
-@@ -2712,21 +2743,10 @@
+@@ -2712,21 +2742,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -216,7 +228,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -2864,7 +2884,7 @@
+@@ -2864,7 +2883,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -225,7 +237,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3350,6 +3370,16 @@
+@@ -3350,6 +3369,16 @@ case $host_os in
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname 
${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
@@ -242,7 +254,7 @@
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -3503,14 +3533,29 @@
+@@ -3503,14 +3532,29 @@ case $host_os in
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -274,7 +286,7 @@
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -3823,6 +3868,11 @@
+@@ -3823,6 +3867,11 @@ case $host_os in
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -286,7 +298,7 @@
    *)
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3985,6 +4035,21 @@
+@@ -3985,6 +4034,21 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -308,7 +320,7 @@
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -5033,9 +5098,15 @@
+@@ -5033,9 +5097,15 @@ AC_MSG_CHECKING([for $compiler option to
        [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
      darwin* | rhapsody*)
@@ -325,7 +337,7 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -5061,6 +5132,10 @@
+@@ -5061,6 +5131,10 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
        esac
        ;;
@@ -336,7 +348,7 @@
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5107,6 +5182,9 @@
+@@ -5107,6 +5181,9 @@ AC_MSG_CHECKING([for $compiler option to
            ;;
        esac
        ;;
@@ -346,7 +358,7 @@
        freebsd* | dragonfly*)
        # FreeBSD uses GNU C++
        ;;