From edwin@mavetju.org  Fri Sep 26 19:30:05 2003
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2928E16A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Sep 2003 19:30:05 -0700 (PDT)
Received: from mag.barnet.com.au (mag.barnet.com.au [218.185.88.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 653A444020
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 26 Sep 2003 19:30:04 -0700 (PDT)
	(envelope-from edwin@mavetju.org)
Received: from extmail.barnet.com.au (tim.direct.int.barnet.com.au [10.10.10.2])
	by mag.barnet.com.au (Postfix) with ESMTP id A08C424E7;
	Sat, 27 Sep 2003 12:29:54 +1000 (EST)
Received: from k7.mavetju (tim.barnet.com.au [218.185.88.1])
	by extmail.barnet.com.au (Postfix) with ESMTP
	id 352081E34; Sat, 27 Sep 2003 12:15:55 +1000 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id 112D36A7101; Sat, 27 Sep 2003 12:15:54 +1000 (EST)
Message-Id: <20030927021554.112D36A7101@k7.mavetju>
Date: Sat, 27 Sep 2003 12:15:54 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: pmarquis@pobox.com
Subject: devel/stlport is broken under -current
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         57267
>Category:       ports
>Synopsis:       devel/stlport is broken under -current
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 26 19:30:13 PDT 2003
>Closed-Date:    Sun Oct 05 01:36:48 PDT 2003
>Last-Modified:  Sun Oct 05 01:36:48 PDT 2003
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Sun Aug 17 16:04:25 EST 2003 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386

>Description:

devel/stlport is broken under -current due to the inclusion of a
file which doesn't exist:

http://bento.freebsd.org/errorlogs/i386-5-latest/stlport-gcc-4.5.3_1.log

g++ -D_THREAD_SAFE -D_REENTRANT -fexceptions -I../stlport -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 -O -pipe -mcpu=pentiumpro -fPIC dll_main.cpp -c -o ../lib/obj/GCC-FREEBSD/ReleaseD/dll_main.o
In file included from stlport_prefix.h:28,
                 from dll_main.cpp:29:
../stlport/ctime:25:44: ../g++/ctime: No such file or directory
In file included from stlport_prefix.h:28,
                 from dll_main.cpp:29:
../stlport/ctime:32: error: `size_t' not declared
[...]

>How-To-Repeat:

-

>Fix:

Simply changing stlport/ctime:25 didn't solve the problem.
>Release-Note:
>Audit-Trail:

From: Edwin Groothuis <edwin@freebsd.org>
To: freebsd-gnats-submit@FreeBSD.org, pmarquis@pobox.com
Cc:  
Subject: Re: ports/57267 - devel/stlport
Date: Sat, 27 Sep 2003 13:35:47 +1000

 Hello,
 
 Just got a message from somebody stating that devel/sdlport isn't
 needed anymore on -current. Can you confirm that and do you want
 me to put a small line in its Makefile to IGNORE the port when
 portbuilding on -current?
 
 Edwin
 
 -- 
 Edwin Groothuis      |            Personal website: http://www.mavetju.org
 edwin@freebsd.org    |    Weblog: http://www.mavetju.org/weblog/weblog.php 

From: Marius Strobl <marius@alchemy.franken.de>
To: edwin@mavetju.org
Cc: freebsd-gnats-submit@FreeBSD.org, pmarquis@pobox.com,
	alexander@leidinger.net
Subject: Re: ports/57267: devel/stlport is broken under -current
Date: Sat, 4 Oct 2003 01:36:35 +0200

 --R+My9LyyhiUvIEro
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 
 Hi,
 
 could you please rather fix it with the attached patch than just marking
 it IGNORE? STLport is currently the base for the C++ support of lang/icc
 and I'd like to also have the GCC version working.
 The patch is tested (and works) on FreeBSD/i386 -stable and -current with
 GCC. Although there are no ICC-specific changes I verified that it doesn't
 break lang/stlport-icc.
 On FreeBSD/alpha and FreeBSD/sparc64 -current lang/stlport compiles with
 this patch however the exception handling test fails. On alpha this looks
 like a GCC-bug, on sparc64 it could be also a bug in FreeBSD however GCC
 is known to have bugs there.
 The patch has also a small fix for the Makefile of the port to allow
 concurrent buils with `make -jX`.
 The wchar-related part of the patch (which is also needed to fix
 compilation on -current) is obtained from the STLport CVS repository.
 
 
 --R+My9LyyhiUvIEro
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="devel::stlport.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/devel/stlport/Makefile,v
 retrieving revision 1.26
 diff -u -r1.26 Makefile
 --- Makefile	28 Feb 2003 22:52:59 -0000	1.26
 +++ Makefile	3 Oct 2003 22:05:14 -0000
 @@ -72,7 +72,7 @@
  post-build:	test
  .endif
  
 -test:
 +test:	do-build
  	cd ${WRKSRC}/../test/eh && ${SETENV} CC=${CC} CXX=${CXX} \
  	${GMAKE} -f ${MAKEFILE} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
  	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 Index: files/patch-stlport::config::stl_gcc.h
 ===================================================================
 RCS file: /mnt/futile/usr/data/bsd/cvs/fbsd/ports/devel/stlport/files/patch-stlport::config::stl_gcc.h,v
 retrieving revision 1.2
 diff -u -r1.2 patch-stlport::config::stl_gcc.h
 --- files/patch-stlport::config::stl_gcc.h	25 Jun 2002 14:19:45 -0000	1.2
 +++ files/patch-stlport::config::stl_gcc.h	3 Oct 2003 21:55:34 -0000
 @@ -1,12 +1,41 @@
  --- stlport/config/stl_gcc.h.orig	Thu Jan 10 19:41:58 2002
  +++ stlport/config/stl_gcc.h	Thu Jun  6 23:15:40 2002
 -@@ -250,8 +250,13 @@
 +@@ -9,8 +9,14 @@
 + 
 + #   define _STLP_NO_MEMBER_TEMPLATE_KEYWORD
 + 
 +-# if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__)
 ++# if defined (__hpux) || defined(__amigaos__)
 + #  define _STLP_NO_WCHAR_T
 ++# elif defined(__FreeBSD__)
 ++# if (__FreeBSD_cc_version < 500005)
 ++# define _STLP_NO_WCHAR_T
 ++# else
 ++# define _STLP_FREEBSD_HAS_WFUNCS
 ++# endif /* __FreeBSD_cc_version < 500005 */
 + # endif
 + 
 + # if defined (__sun)
 +@@ -77,7 +83,7 @@
 + 
 + # endif
 + 
 +-#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (__sun)) 
 ++#if defined (__CYGWIN__) || defined (__MINGW32__) || !(defined (_STLP_USE_GLIBC) || defined (_STLP_FREEBSD_HAS_WFUNCS) || defined (__sun))
 + #ifndef __MINGW32__
 + #   define _STLP_NO_NATIVE_MBSTATE_T      1
 + #endif
 +@@ -250,8 +256,17 @@
   
   # if (__GNUC__ >= 3)
   
  +#ifdef __FreeBSD__
 -+#  define _STLP_NATIVE_INCLUDE_PATH ../g++
 -+#  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
 ++#  if (__FreeBSD_cc_version > 500005)
 ++#    define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
 ++#  else
 ++#    define _STLP_NATIVE_INCLUDE_PATH ../g++
 ++#    define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward
 ++#  endif
  +#else
   #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
   #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
 Index: files/patch-stlport::cwchar
 ===================================================================
 RCS file: files/patch-stlport::cwchar
 diff -N files/patch-stlport::cwchar
 --- files/patch-stlport::cwchar	17 Sep 2002 12:52:06 -0000	1.2
 +++ /dev/null	1 Jan 1970 00:00:00 -0000
 @@ -1,22 +0,0 @@
 ---- stlport/cwchar.orig	Thu Jan 10 19:41:56 2002
 -+++ stlport/cwchar	Thu Jun  6 23:24:28 2002
 -@@ -21,6 +21,10 @@
 - #  include <stl/_prolog.h>
 - # endif
 - 
 -+#if defined (__FreeBSD__) && defined (__GNUC__)
 -+# include <../wchar.h>
 -+#endif
 -+
 - # ifdef __GNUC__
 - #  include <cstddef>
 - # endif
 -@@ -36,7 +40,7 @@
 - # elif defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T)
 - 
 - #  include _STLP_NATIVE_C_HEADER(stddef.h)
 --#  if defined (__FreeBSD__) || defined (__Lynx__)
 -+#  if defined (__Lynx__)
 - #   ifndef _WINT_T
 - typedef long int wint_t;
 - #    define _WINT_T
 Index: files/patch-stlport::stl::_bvector.h
 ===================================================================
 RCS file: files/patch-stlport::stl::_bvector.h
 diff -N files/patch-stlport::stl::_bvector.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-stlport::stl::_bvector.h	3 Oct 2003 21:23:23 -0000
 @@ -0,0 +1,12 @@
 +--- stlport/stl/_bvector.h.orig	Fri Oct  3 23:22:06 2003
 ++++ stlport/stl/_bvector.h	Fri Oct  3 23:22:38 2003
 +@@ -34,7 +34,9 @@
 + # include <stl/_vector.h>
 + # endif
 + 
 ++#ifndef __WORD_BIT
 + #define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
 ++#endif
 + 
 + _STLP_BEGIN_NAMESPACE 
 + 
 
 --R+My9LyyhiUvIEro--

From: Paul Marquis <pmarquis@pobox.com>
To: Marius Strobl <marius@alchemy.franken.de>,
	Edwin Groothuis <edwin@mavetju.org>
Cc: Alexander Leidinger <alexander@leidinger.net>,
	freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/57267: devel/stlport is broken under -current
Date: Sat, 4 Oct 2003 16:22:53 -0400

 =2D----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Marius,
 
 Thanks for taking the time to look at this.  It's been on my TODO list=20
 for quite a while. =20
 
 I looked at the patches and verified that they work on -stable.  I=20
 don't run -current (yet), so I'll accept that the patches fix the=20
 build on -current.
 
 Again, many thanks!
 
 On Friday 03 October 2003 07:36 pm, Marius Strobl wrote:
 > Hi,
 >
 > could you please rather fix it with the attached patch than just
 > marking it IGNORE? STLport is currently the base for the C++
 > support of lang/icc and I'd like to also have the GCC version
 > working.
 > The patch is tested (and works) on FreeBSD/i386 -stable and
 > -current with GCC. Although there are no ICC-specific changes I
 > verified that it doesn't break lang/stlport-icc.
 > On FreeBSD/alpha and FreeBSD/sparc64 -current lang/stlport compiles
 > with this patch however the exception handling test fails. On alpha
 > this looks like a GCC-bug, on sparc64 it could be also a bug in
 > FreeBSD however GCC is known to have bugs there.
 > The patch has also a small fix for the Makefile of the port to
 > allow concurrent buils with `make -jX`.
 > The wchar-related part of the patch (which is also needed to fix
 > compilation on -current) is obtained from the STLport CVS
 > repository.
 
 =2D --=20
 Paul Marquis
 pmarquis@pobox.com
 =2D----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQE/fywhIuLAUo3z6B0RAgvoAKC7W7ml7E34rHMlOXa7bkFVilSzrACfd8Wi
 wMZdHs+9c6eHWzJ5RueX4mU=3D
 =3D358+
 =2D----END PGP SIGNATURE-----
 
State-Changed-From-To: open->closed 
State-Changed-By: netchild 
State-Changed-When: Sun Oct 5 01:35:35 PDT 2003 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57267 
>Unformatted:
