From bacf0d5d53c1c4366de076171b8c7ff8c4d551e4 Mon Sep 17 00:00:00 2001
From: yyamano <yyamano@pkgsrc.org>
Date: Thu, 16 Feb 2006 15:52:15 +0000
Subject: Make this buld with gcc 4.x. Fix PR 32744.

---
 print/cups/distinfo         |  3 ++-
 print/cups/patches/patch-ah | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 print/cups/patches/patch-ah

(limited to 'print/cups')

diff --git a/print/cups/distinfo b/print/cups/distinfo
index 2e8fc61d34d..1ff1abac7ff 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2006/02/15 19:06:13 joerg Exp $
+$NetBSD: distinfo,v 1.38 2006/02/16 15:52:15 yyamano Exp $
 
 SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
 RMD160 (cups-1.1.23-source.tar.bz2) = 255ec4c22422b14f2367d69f3ec7e590dc46bea5
@@ -10,6 +10,7 @@ SHA1 (patch-ad) = 166749eb9fc7b4b20e123d81cd3b2cf96db27677
 SHA1 (patch-ae) = 773b723b3cbd669cd1695577c578fea0fc7fa7f8
 SHA1 (patch-af) = 04e5bf3b73083eb2457a20b0f5238f017fe4aaab
 SHA1 (patch-ag) = 47a5c7a9ad7c604fa3253aebbaa62f576fb477d0
+SHA1 (patch-ah) = 1ef58b7e1dfcbd8aabb9e822d30f995b3d653ea4
 SHA1 (patch-an) = 8eb0f80067839d3d112d93e08cb8ad6854fa2b4c
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
 SHA1 (patch-ap) = 81b8213e16f875b22d0684d0c06dfe75af11dcb4
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
new file mode 100644
index 00000000000..7515b7c8d03
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,41 @@
+$NetBSD: patch-ah,v 1.14 2006/02/16 15:52:15 yyamano Exp $
+
+--- config-scripts/cups-compiler.m4.orig	2005-01-04 04:29:45.000000000 +0900
++++ config-scripts/cups-compiler.m4
+@@ -39,36 +39,6 @@ CXXLIBS=""
+ AC_SUBST(CXXLIBS)
+ 
+ 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.
+-	#
+-	# Also, GCC 3.0.x still has problems compiling some code.  You may
+-	# or may not have success with it.  USE 3.0.x WITH EXTREME CAUTION!
+-	#
+-	# Previous versions of GCC do not have the reliance on the stdc++
+-	# or g++ libraries, so the extra supc++ library is not needed.
+-
+-	AC_MSG_CHECKING(if libsupc++ is required)
+-
+- 	SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
+-	case "$SUPC" in
+-    		libsupc++.a*)
+-			# Library not found, so this is and older GCC...
+-			AC_MSG_RESULT(no)
+-			;;
+-		*)
+-        		# This is gcc 3.x, and it knows of libsupc++, so we need it
+-        		CXXLIBS="-lsupc++"
+-        		AC_MSG_RESULT(yes)
+-			;;
+-	esac
+-
+-	CXX="$CC"
+-
+ 	if test -z "$OPTIM"; then
+ 		if test "x$with_optim" = x; then
+ 			if test $uname = HP-UX; then
-- 
cgit v1.2.3