svn commit: r390582 - head/sysutils/apcupsd/files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Jun 25 16:12:35 2015
New Revision: 390582
URL: https://svnweb.freebsd.org/changeset/ports/390582

Log:
  - Remove broken code from configure, fixing build on 9.x
  
  This code is related to gcc 3 and is now useless; as a side effect, it sets LD to CC while it should be CXX, breaking the build:
  
  ModbusComm.cpp:(.text+0x5f4): undefined reference to `operator new[](unsigned int)'
  
  Submitted by:	pkg-fallout
  Approved by:	portmgr blanket

Added:
  head/sysutils/apcupsd/files/patch-configure   (contents, props changed)

Added: head/sysutils/apcupsd/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/apcupsd/files/patch-configure	Thu Jun 25 16:12:35 2015	(r390582)
@@ -0,0 +1,56 @@
+--- configure.orig	2015-01-04 20:35:43 UTC
++++ configure
+@@ -12678,53 +12678,6 @@ $as_echo "$as_me: error: gethostbyname_r
+ esac
+ 
+ if test -n "$GCC"; then
+-   # Starting with GCC 3.0, you must link C++ programs against either
+-   # libstdc++ (shared by default), or libsupc++ (always static).  If
+-   # you care about binary portability between Linux distributions,
+-   # you need to either 1) build your own GCC with static C++ libraries
+-   # or 2) link using gcc and libsupc++.  We choose the latter since
+-   # CUPS doesn't (currently) use any of the stdc++ library.
+-   #
+-   # Previous versions of GCC do not have the reliance on the stdc++
+-   # or g++ libraries, so the extra supc++ library is not needed.
+-   { $as_echo "$as_me:$LINENO: checking if libsupc++ is required" >&5
+-$as_echo_n "checking if libsupc++ is required... " >&6; }
+-
+-   SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
+-   case "$SUPC" in
+-   libsupc++.a*)
+-      # Library not found, so this is an older GCC...
+-      LD="$CXX"
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-      ;;
+-   *)
+-      # This is gcc 3.x, and it knows of libsupc++, so we need it
+-      LIBS="$LIBS -lsupc++"
+-      LD="$CC"
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-      # See if this system has a broken libsupc++ that requires
+-      # a workaround (FreeBSD 5.x, 6.x)
+-      case $host in
+-         *-*-freebsd*)
+-            { $as_echo "$as_me:$LINENO: checking if libsupc++ is missing __terminate_handler" >&5
+-$as_echo_n "checking if libsupc++ is missing __terminate_handler... " >&6; }
+-            nm -C --defined-only "$SUPC" 2>/dev/null | grep __terminate_handler > /dev/null
+-            if test $? -eq 0 ; then
+-               { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-            else
+-               { $as_echo "$as_me:$LINENO: result: yes -- will attempt workaround" >&5
+-$as_echo "yes -- will attempt workaround" >&6; }
+-               LIBEXTRAOBJ="$LIBEXTRAOBJ libsupc++fix.cpp"
+-            fi
+-            ;;
+-      esac
+-      ;;
+-   esac
+-
+    # See if GCC supports -fno-exceptions...
+    { $as_echo "$as_me:$LINENO: checking if GCC supports -fno-exceptions" >&5
+ $as_echo_n "checking if GCC supports -fno-exceptions... " >&6; }