pkgsrc-Changes-HG archive

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

[pkgsrc/pkgsrc-2004Q4]: pkgsrc Pullup ticket 180 - requested by grant beattie



details:   https://anonhg.NetBSD.org/pkgsrc/rev/523c2573cdf6
branches:  pkgsrc-2004Q4
changeset: 485768:523c2573cdf6
user:      snj <snj%pkgsrc.org@localhost>
date:      Thu Dec 23 03:35:47 2004 +0000

description:
Pullup ticket 180 - requested by grant beattie
portability fix for libtool

Module Name:    pkgsrc
Committed By:   grant
Date:           Tue Dec 21 13:50:25 UTC 2004

Modified Files:
        pkgsrc/devel/libtool: distinfo
        pkgsrc/devel/libtool-base: Makefile
        pkgsrc/devel/libtool/patches: patch-ab patch-ac patch-ad

Log Message:
add DragonFly support from patch sent to libtool-patches:

        http://lists.gnu.org/archive/html/libtool-patches/2004-12/msg00188.html

tested with gcc2 and gcc3 in-tree compilers.

bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   grant
Date:           Tue Dec 21 13:52:26 UTC 2004

Modified Files:
        pkgsrc/mk/platform: DragonFly.mk

Log Message:
libtool>=1.5.10nb9 actually works on DragonFly, so require at
least that version.

diffstat:

 devel/libtool-base/Makefile    |    4 +-
 devel/libtool/distinfo         |    8 +-
 devel/libtool/patches/patch-ab |  194 ++++++++++++++++++++++++++++------
 devel/libtool/patches/patch-ac |   56 +++++++++-
 devel/libtool/patches/patch-ad |  226 ++++++++++++++++++++++++++++++++++------
 mk/platform/DragonFly.mk       |    3 +-
 6 files changed, 408 insertions(+), 83 deletions(-)

diffs (truncated from 1080 to 300 lines):

diff -r c80e2a3b6a90 -r 523c2573cdf6 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Thu Dec 23 02:36:07 2004 +0000
+++ b/devel/libtool-base/Makefile       Thu Dec 23 03:35:47 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2004/12/18 17:42:24 grant Exp $
+# $NetBSD: Makefile,v 1.49.2.1 2004/12/23 03:35:47 snj Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   8
+PKGREVISION=   9
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r c80e2a3b6a90 -r 523c2573cdf6 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Thu Dec 23 02:36:07 2004 +0000
+++ b/devel/libtool/distinfo    Thu Dec 23 03:35:47 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2004/12/18 17:42:24 grant Exp $
+$NetBSD: distinfo,v 1.53.2.1 2004/12/23 03:35:47 snj Exp $
 
 SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
 Size (libtool-1.5.10.tar.gz) = 2699923 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = fa1f9d9b879e1c7b44c7c8a9b0b0969750b6de77
-SHA1 (patch-ac) = 2123be2150e7f86980b903574b742454addd7b75
-SHA1 (patch-ad) = 17ae54beead8ed189cf7aab8708d40d499750e7d
+SHA1 (patch-ab) = f8c99bbf05d8ee7de6d2a4e6064706ee438b9938
+SHA1 (patch-ac) = 97e96e4ad5059190985f03b5f3f10a64f7563ebd
+SHA1 (patch-ad) = d0eb258c82bd8d551ed714f9af226e3a9dc688e4
diff -r c80e2a3b6a90 -r 523c2573cdf6 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Thu Dec 23 02:36:07 2004 +0000
+++ b/devel/libtool/patches/patch-ab    Thu Dec 23 03:35:47 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
+$NetBSD: patch-ab,v 1.47.2.1 2004/12/23 03:35:47 snj Exp $
 
 --- configure.orig     2004-09-19 22:22:04.000000000 +1000
 +++ configure
@@ -16,6 +16,22 @@
      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.
+@@ -4496,13 +4496,13 @@ darwin* | rhapsody*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
 @@ -4534,6 +4534,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
@@ -50,6 +66,15 @@
  
  
  
+@@ -5974,7 +5971,7 @@ else
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* )
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* )
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 @@ -6909,9 +6906,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
@@ -156,7 +181,24 @@
        need_version=yes
        ;;
    esac
-@@ -8422,15 +8454,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8366,6 +8398,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  need_version=no
++  need_lib_prefix=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ gnu*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -8422,15 +8464,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -185,7 +227,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8507,11 +8546,11 @@ knetbsd*-gnu)
+@@ -8507,11 +8556,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -199,7 +241,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8542,10 +8581,10 @@ nto-qnx*)
+@@ -8542,10 +8591,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -212,7 +254,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
-@@ -10105,9 +10144,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10105,9 +10154,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -223,7 +265,7 @@
          ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10659,7 +10696,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10659,7 +10706,7 @@ if test -z "$aix_libpath"; then aix_libp
            archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
            module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -232,7 +274,16 @@
            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle 
$libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -10817,6 +10854,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10693,7 +10740,7 @@ if test -z "$aix_libpath"; then aix_libp
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -10817,6 +10864,16 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
      esac
      ;;
@@ -249,7 +300,7 @@
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10934,14 +10981,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10934,14 +10991,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -281,7 +332,7 @@
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11324,6 +11386,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11324,6 +11396,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -303,7 +354,7 @@
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11371,9 +11448,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11371,9 +11458,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -316,7 +367,7 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11395,6 +11474,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11395,6 +11484,10 @@ echo $ECHO_N "checking for $compiler opt
        ;;
        esac
        ;;
@@ -327,7 +378,16 @@
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11469,6 +11552,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11441,7 +11534,7 @@ echo $ECHO_N "checking for $compiler opt
+           ;;
+       esac
+       ;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
+       # FreeBSD uses GNU C++
+       ;;
+       hpux9* | hpux10* | hpux11*)
+@@ -11469,6 +11562,8 @@ echo $ECHO_N "checking for $compiler opt
            ;;
        esac
        ;;
@@ -336,7 +396,7 @@
        irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
-@@ -11939,6 +12024,7 @@ beos*)
+@@ -11939,6 +12034,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -344,7 +404,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'
-@@ -12053,16 +12139,17 @@ kfreebsd*-gnu)
+@@ -12053,16 +12149,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -368,7 +428,24 @@
        need_version=yes
        ;;
    esac
-@@ -12138,15 +12225,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12082,6 +12179,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  need_version=no
++  need_lib_prefix=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ gnu*)
+   version_type=linux
+   need_lib_prefix=no
+@@ -12138,15 +12245,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -397,7 +474,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12223,11 +12317,11 @@ knetbsd*-gnu)
+@@ -12223,11 +12337,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -411,7 +488,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12258,10 +12352,10 @@ nto-qnx*)
+@@ -12258,10 +12372,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -424,7 +501,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
-@@ -13805,9 +13899,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13805,9 +13919,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -437,7 +514,7 @@
        ;;
  
      msdosdjgpp*)
-@@ -13836,6 +13932,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13836,6 +13952,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -449,7 +526,7 @@
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14221,6 +14322,17 @@ EOF
+@@ -14221,6 +14342,17 @@ EOF



Home | Main Index | Thread Index | Old Index