pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Fix completely hosed test for g++ when CXX=g++. Th...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e94748429974
branches:  trunk
changeset: 481438:e94748429974
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Oct 04 19:48:09 2004 +0000

description:
Fix completely hosed test for g++ when CXX=g++.  The old test worked fine.
Revert until the hosage is tracked down and eliminated at the source.

(Bump to libtool-1.5.10nb1, and make this the required version.)

diffstat:

 devel/libtool-base/Makefile             |    9 +-
 devel/libtool/distinfo                  |    6 +-
 devel/libtool/patches/manual-libtool.m4 |   67 +++-
 devel/libtool/patches/manual.README     |   10 +-
 devel/libtool/patches/patch-ab          |  522 +++++++++++++++++--------------
 devel/libtool/patches/patch-ad          |  522 +++++++++++++++++--------------
 mk/bsd.pkg.mk                           |    4 +-
 7 files changed, 629 insertions(+), 511 deletions(-)

diffs (truncated from 1688 to 300 lines):

diff -r c8739a3f0b0c -r e94748429974 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Mon Oct 04 17:57:08 2004 +0000
+++ b/devel/libtool-base/Makefile       Mon Oct 04 19:48:09 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: Makefile,v 1.40 2004/10/04 19:48:10 tv Exp $
 #
 
 PKGNAME=       ${DISTNAME:C/-/-base-/}
+PKGREVISION=   1
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
@@ -21,13 +22,15 @@
 
 .if ${OPSYS} == "NetBSD"
 .  if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so)
-CONFIGURE_ARGS=                --disable-shared
+CONFIGURE_ARGS+=       --disable-shared
 BUILD_SHLIBTOOL=       NO
 .  endif
 .else
-CONFIGURE_ARGS=                --enable-ltdl-install
+CONFIGURE_ARGS+=       --enable-ltdl-install
 .endif
 
+CONFIGURE_ARGS+=       --with-tags=CXX,F77,GCJ
+
 # The configure script persists in trying to find the path to ld, which
 # always ends up in ${BUILDLINK_DIR}.  Prevent it from caring.
 #
diff -r c8739a3f0b0c -r e94748429974 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Mon Oct 04 17:57:08 2004 +0000
+++ b/devel/libtool/distinfo    Mon Oct 04 19:48:09 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2004/10/03 00:13:31 tv Exp $
+$NetBSD: distinfo,v 1.46 2004/10/04 19:48:09 tv 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) = b6602584eb17c343838af13c706961ffeae7745a
+SHA1 (patch-ab) = 7b6db6dc7f57bd5425542e156308793a52729c58
 SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3
-SHA1 (patch-ad) = 10c4330056c6a7c20bff0ed81407c21a5ac00b32
+SHA1 (patch-ad) = a2d0742ff45539b06c346b8bee8e04645441e266
diff -r c8739a3f0b0c -r e94748429974 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Mon Oct 04 17:57:08 2004 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Mon Oct 04 19:48:09 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.6 2004/10/04 19:48:09 tv Exp $
 
 --- libtool.m4.orig    2004-09-19 08:15:08.000000000 -0400
 +++ libtool.m4
@@ -90,7 +90,18 @@
    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
-@@ -2198,6 +2207,10 @@ hpux10.20* | hpux11*)
+@@ -1688,9 +1697,7 @@ if test -f "$ltmain" && test -n "$tagnam
+ 
+       case $tagname in
+       CXX)
+-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-          ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+-          (test "X$CXX" != "Xg++"))) ; then
++      if test -n "$CXX" && test "X$CXX" != "Xno"; then
+         AC_LIBTOOL_LANG_CXX_CONFIG
+       else
+         tagname=""
+@@ -2198,6 +2205,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -101,7 +112,39 @@
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -3091,6 +3104,8 @@ case $host_os in
+@@ -2425,21 +2436,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++AC_REQUIRE([AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+ 
+-# _LT_AC_PROG_CXXCPP
+-# ---------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+-    (test "X$CXX" != "Xg++"))) ; then
+-  AC_PROG_CXXCPP
+-fi
+-])# _LT_AC_PROG_CXXCPP
+ 
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2604,7 +2604,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++AC_REQUIRE([AC_PROG_CXXCPP])
+ 
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -3091,6 +3091,8 @@ case $host_os in
        ;;
      esac
      ;;
@@ -110,7 +153,7 @@
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -3210,6 +3225,13 @@ case $host_os in
+@@ -3210,6 +3212,13 @@ case $host_os in
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -124,7 +167,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -3651,6 +3673,14 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3651,6 +3660,14 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -139,7 +182,7 @@
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4591,9 +4621,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4591,9 +4608,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -152,7 +195,7 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4615,6 +4647,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4615,6 +4634,10 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
        esac
        ;;
@@ -163,7 +206,7 @@
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -4689,6 +4725,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4689,6 +4712,8 @@ AC_MSG_CHECKING([for $compiler option to
            ;;
        esac
        ;;
@@ -172,7 +215,7 @@
        irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
-@@ -4854,9 +4892,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4854,9 +4879,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
  
      darwin* | rhapsody*)
@@ -185,7 +228,7 @@
        ;;
  
      msdosdjgpp*)
-@@ -4885,6 +4925,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4885,6 +4912,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
  
@@ -197,7 +240,7 @@
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5187,6 +5232,17 @@ EOF
+@@ -5187,6 +5219,17 @@ EOF
        fi
        ;;
  
@@ -215,7 +258,7 @@
      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'
-@@ -5592,6 +5648,20 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5592,6 +5635,20 @@ $echo "local: *; };" >> $output_objdir/$
        fi
        ;;
  
diff -r c8739a3f0b0c -r e94748429974 devel/libtool/patches/manual.README
--- a/devel/libtool/patches/manual.README       Mon Oct 04 17:57:08 2004 +0000
+++ b/devel/libtool/patches/manual.README       Mon Oct 04 19:48:09 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual.README,v 1.4 2004/09/27 14:40:58 tv Exp $
+$NetBSD: manual.README,v 1.5 2004/10/04 19:48:09 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
@@ -18,6 +18,7 @@
 
 [edit *.m4 files and put patches back to manual-*]
 
+./configure
 make ./configure
 pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
 cp -f acinclude.m4 libltdl/
@@ -25,8 +26,11 @@
 pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
 cd /usr/pkgsrc/devel/libtool
 make makepatchsum
-cvs commit
+
+[clean and test new libtool-base]
+
+[bump PKGREVISION of libtool-base and commit libtool & libtool-base dirs]
 
 =====
 
-- tv%duh.org@localhost, 20 Apr 2004
+- tv%duh.org@localhost, 4 Oct 2004
diff -r c8739a3f0b0c -r e94748429974 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Mon Oct 04 17:57:08 2004 +0000
+++ b/devel/libtool/patches/patch-ab    Mon Oct 04 19:48:09 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
+$NetBSD: patch-ab,v 1.41 2004/10/04 19:48:09 tv Exp $
 
 --- configure.orig     2004-09-19 08:22:04.000000000 -0400
 +++ configure
@@ -13,7 +13,30 @@
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -6909,9 +6913,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -5690,12 +5694,7 @@ fi
+ 
+ done
+ 
+-
+-
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  ac_ext=cc
++ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -5925,8 +5924,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-fi
+-
+ 
+ 
+ 
+@@ -6909,9 +6906,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -26,7 +49,7 @@
        ;;
  
      msdosdjgpp*)
-@@ -6940,6 +6946,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6940,6 +6939,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -38,7 +61,7 @@
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7325,6 +7336,17 @@ EOF
+@@ -7325,6 +7329,17 @@ EOF
        fi
        ;;
  
@@ -56,7 +79,7 @@
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7832,6 +7854,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7832,6 +7847,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -77,7 +100,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'



Home | Main Index | Thread Index | Old Index