ports/57267: devel/stlport is broken under -current

Fri Oct 3 23:40:19 UTC 2003

The following reply was made to PR ports/57267; it has been noted by GNATS.

From: Marius Strobl <marius at alchemy.franken.de>
To: edwin at mavetju.org
Cc: freebsd-gnats-submit at FreeBSD.org, pmarquis at pobox.com,
	alexander at 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--