pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Don't try to link against libc_r on DragonFly.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/914cf04fec1e
branches:  trunk
changeset: 392519:914cf04fec1e
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Sat May 02 07:51:02 2009 +0000

description:
Don't try to link against libc_r on DragonFly.

diffstat:

 mail/thunderbird/distinfo         |   4 ++--
 mail/thunderbird/patches/patch-ab |  28 +++++++++++++++++++---------
 time/sunbird/distinfo             |   4 ++--
 time/sunbird/patches/patch-ab     |  32 +++++++++++++++++++++-----------
 www/firefox/distinfo              |   4 ++--
 www/firefox/patches/patch-ab      |  26 ++++++++++++++++++--------
 www/seamonkey/Makefile.common     |   6 +++---
 www/seamonkey/distinfo            |   4 ++--
 www/seamonkey/patches/patch-ab    |  28 +++++++++++++++++++---------
 9 files changed, 88 insertions(+), 48 deletions(-)

diffs (truncated from 377 to 300 lines):

diff -r 90c9d1f9beed -r 914cf04fec1e mail/thunderbird/distinfo
--- a/mail/thunderbird/distinfo Sat May 02 05:07:57 2009 +0000
+++ b/mail/thunderbird/distinfo Sat May 02 07:51:02 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.52 2009/04/07 08:01:01 hasso Exp $
+$NetBSD: distinfo,v 1.53 2009/05/02 07:51:02 hasso Exp $
 
 SHA1 (thunderbird-2.0.0.21-source.tar.bz2) = 8bb2f7ce60635f6082c3c4542fff10c4b7445dc0
 RMD160 (thunderbird-2.0.0.21-source.tar.bz2) = 493e41013a91888d29647c126d4f2c5a547056dd
 Size (thunderbird-2.0.0.21-source.tar.bz2) = 40484246 bytes
 SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
-SHA1 (patch-ab) = 1dda9cc5822761da53133e987e30c133894baad7
+SHA1 (patch-ab) = de3452875e0fd0dc207c9f5e4bdffab72a43155e
 SHA1 (patch-ac) = 24da4ecce48d22a3752276cae132845b4b474c2a
 SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
 SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
diff -r 90c9d1f9beed -r 914cf04fec1e mail/thunderbird/patches/patch-ab
--- a/mail/thunderbird/patches/patch-ab Sat May 02 05:07:57 2009 +0000
+++ b/mail/thunderbird/patches/patch-ab Sat May 02 07:51:02 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2007/05/12 06:53:22 ghen Exp $
+$NetBSD: patch-ab,v 1.11 2009/05/02 07:51:03 hasso Exp $
 
---- configure.in.orig  2007-03-14 02:00:50.000000000 +0100
-+++ configure.in
-@@ -1433,7 +1433,6 @@ case "$target" in
+--- configure.in.orig  2008-10-19 19:14:06 +0300
++++ configure.in       2009-05-02 09:52:59 +0300
+@@ -1532,7 +1532,6 @@ case "$target" in
      DSO_LDOPTS=''
      STRIP="$STRIP -x -S"
      _PLATFORM_DEFAULT_TOOLKIT='mac'
@@ -10,7 +10,7 @@
      TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      # set MACOSX to generate lib/mac/MoreFiles/Makefile
      MACOSX=1
-@@ -1452,7 +1451,7 @@ case "$target" in
+@@ -1551,7 +1550,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -19,7 +19,7 @@
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
        DLL_SUFFIX=".so.1.0"
        DSO_LDOPTS="-shared"
-@@ -1466,6 +1465,9 @@ case "$target" in
+@@ -1565,6 +1564,9 @@ case "$target" in
  #     MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #     MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -29,7 +29,7 @@
      ;; 
  
  *-hpux*)
-@@ -2136,7 +2138,7 @@ dnl the qsort routine under solaris is f
+@@ -2235,7 +2237,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -38,7 +38,17 @@
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -2836,7 +2838,7 @@ then
+@@ -2749,6 +2751,9 @@ dnl ====================================
+ case $target in
+ *-hpux11.*)
+       ;;
++*-dragonfly*)
++      AC_CHECK_LIB(c, gethostbyname_r)
++      ;;
+ *)
+       AC_CHECK_LIB(c_r, gethostbyname_r)
+       ;;
+@@ -2946,7 +2951,7 @@ then
      fi
  
        case "$target" in
@@ -47,7 +57,7 @@
                        AC_DEFINE(_REENTRANT)
                        AC_DEFINE(_THREAD_SAFE)
                        dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -5638,7 +5640,7 @@ dnl ====================================
+@@ -5714,7 +5719,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff -r 90c9d1f9beed -r 914cf04fec1e time/sunbird/distinfo
--- a/time/sunbird/distinfo     Sat May 02 05:07:57 2009 +0000
+++ b/time/sunbird/distinfo     Sat May 02 07:51:02 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2009/04/07 17:25:54 hasso Exp $
+$NetBSD: distinfo,v 1.11 2009/05/02 07:51:03 hasso Exp $
 
 SHA1 (sunbird-0.3.1.source.tar.bz2) = f8a397746f0e3abf15273de5232c447746a8d370
 RMD160 (sunbird-0.3.1.source.tar.bz2) = b2fe3d03ce20500641e18da07fafda031d7b882e
 Size (sunbird-0.3.1.source.tar.bz2) = 44088609 bytes
 SHA1 (patch-aa) = b9c9f28e3c2d9ff5e3b982dda6d1332e2c025570
-SHA1 (patch-ab) = 8665353e9f1d98474c5d923f76b1ea1a333c2783
+SHA1 (patch-ab) = d68fc0b694680f3e78d79a6d149ff0ff3eab5e72
 SHA1 (patch-ac) = 889d805590865e1aa800db73230b05984070d779
 SHA1 (patch-ad) = efca5ab6ad16fbc7a16f20ca181b23add7dd6f78
 SHA1 (patch-ae) = 8e31ede283ba33528f825ab6dd794eb4e17b78d9
diff -r 90c9d1f9beed -r 914cf04fec1e time/sunbird/patches/patch-ab
--- a/time/sunbird/patches/patch-ab     Sat May 02 05:07:57 2009 +0000
+++ b/time/sunbird/patches/patch-ab     Sat May 02 07:51:02 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/06/27 11:11:52 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2009/05/02 07:51:03 hasso Exp $
 
---- configure.in.orig  2006-05-06 17:53:27.000000000 +0000
-+++ configure.in
-@@ -1489,7 +1489,6 @@ case "$target" in
+--- configure.in.orig  2006-09-28 00:02:07 +0300
++++ configure.in       2009-05-02 10:04:27 +0300
+@@ -1490,7 +1490,6 @@ case "$target" in
      DSO_LDOPTS=''
      STRIP="$STRIP -x -S"
      _PLATFORM_DEFAULT_TOOLKIT='mac'
@@ -10,7 +10,7 @@
      TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
      # set MACOSX to generate lib/mac/MoreFiles/Makefile
      MACOSX=1
-@@ -1522,6 +1521,18 @@ case "$target" in
+@@ -1523,6 +1522,18 @@ case "$target" in
  #     MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #     MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -29,7 +29,7 @@
      ;; 
  
  *-hpux*)
-@@ -1705,7 +1716,6 @@ case "$target" in
+@@ -1708,7 +1719,6 @@ case "$target" in
      BIN_SUFFIX='.exe'
      USE_SHORT_LIBNAME=1
      MOZ_ENABLE_COREXFONTS=
@@ -37,7 +37,7 @@
      MOZ_USER_DIR="Mozilla"
  ;;
  
-@@ -1952,6 +1962,14 @@ case "$target" in
+@@ -1955,6 +1965,14 @@ case "$target" in
      fi
      MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX) -o $@'
@@ -52,7 +52,7 @@
      ;;
  
  *-nto*) 
-@@ -1992,6 +2010,13 @@ case "$target" in
+@@ -1995,6 +2013,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
        DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -66,7 +66,7 @@
      ;;
  
  *-openvms*) 
-@@ -2688,7 +2713,7 @@ dnl Checks for header files.
+@@ -2691,7 +2716,7 @@ dnl Checks for header files.
  dnl ========================================================
  AC_HEADER_DIRENT
  case "$target_os" in
@@ -75,7 +75,17 @@
  # for stuff like -lXshm
      CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
      ;;
-@@ -2948,6 +2973,10 @@ then
+@@ -2731,6 +2756,9 @@ dnl ====================================
+ case $target in
+ *-hpux11.*)
+       ;;
++*-dragonfly*)
++      AC_CHECK_LIB(c, gethostbyname_r)
++      ;;
+ *)
+       AC_CHECK_LIB(c_r, gethostbyname_r)
+       ;;
+@@ -2951,6 +2979,10 @@ then
                        fi
                        ;;
  
@@ -86,7 +96,7 @@
            *-*-openbsd*|*-*-bsdi*)
                        AC_DEFINE(_REENTRANT)
                        AC_DEFINE(_THREAD_SAFE)
-@@ -5929,7 +5958,7 @@ dnl ====================================
+@@ -6041,7 +6073,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff -r 90c9d1f9beed -r 914cf04fec1e www/firefox/distinfo
--- a/www/firefox/distinfo      Sat May 02 05:07:57 2009 +0000
+++ b/www/firefox/distinfo      Sat May 02 07:51:02 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.85 2009/04/07 08:01:01 hasso Exp $
+$NetBSD: distinfo,v 1.86 2009/05/02 07:51:03 hasso Exp $
 
 SHA1 (firefox-2.0.0.19-source.tar.bz2) = 8c4f87c50a0ecf78530b6fbfaac3123196a260a9
 RMD160 (firefox-2.0.0.19-source.tar.bz2) = e5bba299e7bc012a70956bcb253517b696a519b1
 Size (firefox-2.0.0.19-source.tar.bz2) = 40298609 bytes
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
-SHA1 (patch-ab) = 19069a4e572744eccb04e9906e16dad28d2dac01
+SHA1 (patch-ab) = 1b19a624adf0f4d9608e9a6eea2f7565b7ff871c
 SHA1 (patch-ac) = 96bee96d365d6a95d14031f4f1df9584b94d570b
 SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
diff -r 90c9d1f9beed -r 914cf04fec1e www/firefox/patches/patch-ab
--- a/www/firefox/patches/patch-ab      Sat May 02 05:07:57 2009 +0000
+++ b/www/firefox/patches/patch-ab      Sat May 02 07:51:02 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2007/05/12 13:53:07 ghen Exp $
+$NetBSD: patch-ab,v 1.8 2009/05/02 07:51:03 hasso Exp $
 
---- configure.in.orig  2006-03-29 22:26:28.000000000 +0200
-+++ configure.in
-@@ -1418,7 +1418,7 @@ case "$target" in
+--- configure.in.orig  2008-10-19 19:14:06 +0300
++++ configure.in       2009-05-01 21:33:19 +0300
+@@ -1551,7 +1551,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -11,7 +11,7 @@
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
        DLL_SUFFIX=".so.1.0"
        DSO_LDOPTS="-shared"
-@@ -1432,6 +1432,9 @@ case "$target" in
+@@ -1565,6 +1565,9 @@ case "$target" in
  #     MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #     MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -21,7 +21,7 @@
      ;; 
  
  *-hpux*)
-@@ -1903,6 +1906,13 @@ case "$target" in
+@@ -2037,6 +2040,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
        DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -35,7 +35,7 @@
      ;;
  
  *-openvms*) 
-@@ -2100,7 +2110,7 @@ dnl the qsort routine under solaris is f
+@@ -2235,7 +2245,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -44,7 +44,17 @@
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -5451,7 +5461,7 @@ dnl ====================================
+@@ -2749,6 +2759,9 @@ dnl ====================================
+ case $target in
+ *-hpux11.*)
+       ;;
++*-dragonfly*)
++      AC_CHECK_LIB(c, gethostbyname_r)
++      ;;
+ *)
+       AC_CHECK_LIB(c_r, gethostbyname_r)
+       ;;
+@@ -5714,7 +5727,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
diff -r 90c9d1f9beed -r 914cf04fec1e www/seamonkey/Makefile.common
--- a/www/seamonkey/Makefile.common     Sat May 02 05:07:57 2009 +0000
+++ b/www/seamonkey/Makefile.common     Sat May 02 07:51:02 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2009/03/18 00:08:40 abs Exp $
+# $NetBSD: Makefile.common,v 1.34 2009/05/02 07:51:03 hasso Exp $
 # used by www/firefox/Makefile-firefox.common
 # used by mail/thunderbird/Makefile-thunderbird.common
 # used by www/seamonkey/Makefile-seamonkey.common
@@ -24,8 +24,8 @@
 
 INSTALL_TEMPLATES+=    ${.CURDIR}/../../www/seamonkey/INSTALL
 
-CONFIG_GUESS_OVERRIDE+=        */*/*/config.guess */*/*/*/config.guess
-CONFIG_SUB_OVERRIDE+=  */*/*/config.sub */*/*/*/config.sub
+CONFIG_GUESS_OVERRIDE+=        */*/config.guess */*/*/config.guess */*/*/*/config.guess
+CONFIG_SUB_OVERRIDE+=  */*/config.sub */*/*/config.sub */*/*/*/config.sub
 CONFIG_STATUS_OVERRIDE=                build/config.status
 CONFIG_STATUS_OVERRIDE+=       nsprpub/config.status
 CONFIG_STATUS_OVERRIDE+=       directory/c-sdk/config.status
diff -r 90c9d1f9beed -r 914cf04fec1e www/seamonkey/distinfo
--- a/www/seamonkey/distinfo    Sat May 02 05:07:57 2009 +0000
+++ b/www/seamonkey/distinfo    Sat May 02 07:51:02 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.39 2009/04/11 09:14:11 ghen Exp $
+$NetBSD: distinfo,v 1.40 2009/05/02 07:51:03 hasso Exp $
 
 SHA1 (seamonkey-1.1.16.source.tar.bz2) = 1dd4a6cda98bb9f86f233ae1cc3bdd49f7361b8e
 RMD160 (seamonkey-1.1.16.source.tar.bz2) = 171bd64f2c3296d0aa92b71794093c1d7e03f36a
 Size (seamonkey-1.1.16.source.tar.bz2) = 38086247 bytes



Home | Main Index | Thread Index | Old Index