Date: Sat, 6 Nov 2004 09:31:38 GMT From: Sepherosa Ziehau <sepherosa@softhome.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/73604: [UPGRADE] deve/stlport 4.5.3 -> 4.6.2 Message-ID: <200411060931.iA69VcWn053019@www.freebsd.org> Resent-Message-ID: <200411060940.iA69eQV6081850@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73604 >Category: ports >Synopsis: [UPGRADE] deve/stlport 4.5.3 -> 4.6.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Nov 06 09:40:26 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Sepherosa Ziehau >Release: FreeBSD 5.2.1-RELEASE >Organization: Foreheed >Environment: FreeBSD sephe-route 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Fri Nov 5 16:47:57 CST 2004 root@sephe-route:/usr/obj/usr/src/sys/ROUTE i386 >Description: upgrade devel/stlport from 4.5.3 to 4.6.2, it compiles and pass tests on 4.10 Release and 5.2.1 Release(502010). It is not known whether devel/stlport-icc is still working (it probably works). And it is not known whether kern.osreldate > 502126 still break (it probably will not break). >How-To-Repeat: >Fix: diff -urN stlport.orig/Makefile stlport/Makefile --- stlport.orig/Makefile Sat Nov 6 16:25:22 2004 +++ stlport/Makefile Sat Nov 6 17:26:31 2004 @@ -7,7 +7,7 @@ # PORTNAME= stlport -PORTVERSION= 4.5.3 +PORTVERSION= 4.6.2 PORTREVISION?= 2 CATEGORIES= devel MASTER_SITES= http://www.stlport.com/archive/ diff -urN stlport.orig/distinfo stlport/distinfo --- stlport.orig/distinfo Sat Nov 6 16:25:22 2004 +++ stlport/distinfo Sat Nov 6 16:35:08 2004 @@ -1,2 +1,2 @@ -MD5 (STLport-4.5.3.tar.gz) = cd4dd34b623a8704fbc800de79705171 -SIZE (STLport-4.5.3.tar.gz) = 739943 +MD5 (STLport-4.6.2.tar.gz) = 4c01c84f1212369ceb369567ed06d1a2 +SIZE (STLport-4.6.2.tar.gz) = 755958 diff -urN stlport.orig/files/patch-src::common_macros.mak stlport/files/patch-src::common_macros.mak --- stlport.orig/files/patch-src::common_macros.mak Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-src::common_macros.mak Sat Nov 6 17:04:02 2004 @@ -1,5 +1,5 @@ ---- src/common_macros.mak.orig Thu Nov 15 17:08:56 2001 -+++ src/common_macros.mak Mon Dec 24 10:37:02 2001 +--- src/common_macros.mak.orig Sun Nov 2 16:58:51 2003 ++++ src/common_macros.mak Sun Oct 31 17:02:57 2004 @@ -10,7 +10,7 @@ # We do not assume any binary compatibility for betas. BETA_SUFFIX= diff -urN stlport.orig/files/patch-src::gcc-freebsd.mak stlport/files/patch-src::gcc-freebsd.mak --- stlport.orig/files/patch-src::gcc-freebsd.mak Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-src::gcc-freebsd.mak Sat Nov 6 17:04:02 2004 @@ -1,13 +1,13 @@ ---- src/gcc-freebsd.mak.orig Tue Nov 27 02:17:56 2001 -+++ src/gcc-freebsd.mak Tue Jun 25 07:30:55 2002 +--- src/gcc-freebsd.mak.orig Fri Jan 16 08:25:37 2004 ++++ src/gcc-freebsd.mak Sat Nov 6 15:40:14 2004 @@ -5,8 +5,8 @@ # # compiler # -CC = gcc -pthread -CXX = c++ -pthread -fexceptions -+CC+= $(PTHREAD_CFLAGS) -D_REENTRANT -+CXX+= $(PTHREAD_CFLAGS) -D_REENTRANT -fexceptions ++CC += $(PTHREAD_CFLAGS) -D_REENTRANT ++CXX += $(PTHREAD_CFLAGS) -D_REENTRANT -fexceptions # # Basename for libraries @@ -16,13 +16,13 @@ LINK=ar cr # 2.95 flag -DYN_LINK=c++ -pthread -fexceptions -shared -o -+DYN_LINK=$(CXX) $(PTHREAD_LIBS) -shared -o ++DYN_LINK=$(CXX) $(PTHREAD_LIBS) -fexceptions -shared -o OBJEXT=o DYNEXT=so @@ -41,8 +41,8 @@ - CXXFLAGS_COMMON = -I$(STLPORT_DIR) $(WARNING_FLAGS) + CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC diff -urN stlport.orig/files/patch-stlport::_cmath.h stlport/files/patch-stlport::_cmath.h --- stlport.orig/files/patch-stlport::_cmath.h Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-stlport::_cmath.h Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- stlport/stl/_cmath.h.orig Wed Jul 24 03:31:26 2002 -+++ stlport/stl/_cmath.h Wed Jul 24 03:32:38 2002 -@@ -100,7 +100,7 @@ - # define _STLP_DO_TAN(_Tp) _STLP_VENDOR_CSTD::tan - # define _STLP_DO_TANH(_Tp) _STLP_VENDOR_CSTD::tanh - # define _STLP_DO_EXP(_Tp) _STLP_VENDOR_CSTD::exp --# if defined (__GNUC__) || defined ( __IBMCPP__ ) || defined (__SUNPRO_CC) -+# if defined (__GNUC__) || defined ( __IBMCPP__ ) || defined (__SUNPRO_CC) || defined (__ICC) - # define _STLP_DO_HYPOT(_Tp) ::hypot - # else - # define _STLP_DO_HYPOT(_Tp) _STLP_VENDOR_CSTD::hypot diff -urN stlport.orig/files/patch-stlport::c_locale.h stlport/files/patch-stlport::c_locale.h --- stlport.orig/files/patch-stlport::c_locale.h Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-stlport::c_locale.h Sat Nov 6 17:04:02 2004 @@ -1,5 +1,5 @@ ---- stlport/stl/c_locale.h.orig Wed Jul 24 03:17:57 2002 -+++ stlport/stl/c_locale.h Wed Jul 24 03:19:25 2002 +--- stlport/stl/c_locale.h.orig Sun Nov 2 16:59:03 2003 ++++ stlport/stl/c_locale.h Sat Nov 6 15:44:22 2004 @@ -178,7 +178,7 @@ _Locale_SPACE ) /* Printable */ # endif /* __Lynx__ */ diff -urN stlport.orig/files/patch-stlport::config::stl_gcc.h stlport/files/patch-stlport::config::stl_gcc.h --- stlport.orig/files/patch-stlport::config::stl_gcc.h Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-stlport::config::stl_gcc.h Sat Nov 6 17:04:02 2004 @@ -1,45 +1,38 @@ ---- 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 -@@ -9,8 +9,14 @@ +--- stlport/config/stl_gcc.h.orig Sun Nov 2 16:59:11 2003 ++++ stlport/config/stl_gcc.h Sat Nov 6 16:05:29 2004 +@@ -9,9 +9,15 @@ # 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) +-# if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) ) ++#if defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) ) +# define _STLP_NO_WCHAR_T ++#elif defined(__FreeBSD__) ++# if (__FreeBSD_cc_version < 500005) + # define _STLP_NO_WCHAR_T +-# endif +# else -+# define _STLP_FREEBSD_HAS_WFUNCS ++# define _STLP_FREEBSD_HAS_WFUNCS +# endif /* __FreeBSD_cc_version < 500005 */ - # endif ++#endif - # if defined (__sun) -@@ -77,7 +83,7 @@ + #ifdef __USLC__ + # include <config/stl_sco.h> +@@ -81,7 +87,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)) ++#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__ -+# 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 -+#endif - - # elif (__GNUC_MINOR__ < 8) - +@@ -267,7 +273,7 @@ + # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 + # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward + # else +-# if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0) ++# if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0) && !defined(__FreeBSD__) + # define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__ + # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward + # else diff -urN stlport.orig/files/patch-stlport::stdexcept stlport/files/patch-stlport::stdexcept --- stlport.orig/files/patch-stlport::stdexcept Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-stlport::stdexcept Sat Nov 6 17:04:02 2004 @@ -1,8 +1,8 @@ ---- stlport/stdexcept.orig Thu Jun 6 23:31:29 2002 -+++ stlport/stdexcept Thu Jun 6 23:31:57 2002 -@@ -49,6 +49,11 @@ - - _STLP_BEGIN_NAMESPACE +--- stlport/stdexcept.orig Sun Nov 2 16:59:01 2003 ++++ stlport/stdexcept Sun Oct 31 17:05:34 2004 +@@ -60,6 +60,11 @@ + # endif + # define _STLP_EXCEPTION_BASE exception +/* maybe limit to gcc 3.x */ +#if defined( __GNUC__) diff -urN stlport.orig/files/patch-stlport::stl::_bvector.h stlport/files/patch-stlport::stl::_bvector.h --- stlport.orig/files/patch-stlport::stl::_bvector.h Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-stlport::stl::_bvector.h Sat Nov 6 17:04:02 2004 @@ -1,5 +1,5 @@ ---- stlport/stl/_bvector.h.orig Fri Oct 3 23:22:06 2003 -+++ stlport/stl/_bvector.h Fri Oct 3 23:22:38 2003 +--- stlport/stl/_bvector.h.orig Sun Nov 2 16:59:07 2003 ++++ stlport/stl/_bvector.h Sun Oct 31 16:48:31 2004 @@ -34,7 +34,9 @@ # include <stl/_vector.h> # endif diff -urN stlport.orig/files/patch-stlport::stl::_cwchar.h stlport/files/patch-stlport::stl::_cwchar.h --- stlport.orig/files/patch-stlport::stl::_cwchar.h Thu Jan 1 08:00:00 1970 +++ stlport/files/patch-stlport::stl::_cwchar.h Sat Nov 6 17:04:02 2004 @@ -0,0 +1,11 @@ +--- stlport/stl/_cwchar.h.orig Sun Nov 2 16:59:08 2003 ++++ stlport/stl/_cwchar.h Sat Nov 6 17:01:49 2004 +@@ -24,7 +24,7 @@ + #endif + #endif + +-# if defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T) ++# if defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || (defined(__FreeBSD__) && !defined(_STLP_FREEBSD_HAS_WFUNCS)) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T) + + # include _STLP_NATIVE_C_HEADER(stddef.h) + # if defined (__FreeBSD__) || defined (__Lynx__) diff -urN stlport.orig/files/patch-stlport::stlcomp.h stlport/files/patch-stlport::stlcomp.h --- stlport.orig/files/patch-stlport::stlcomp.h Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-stlport::stlcomp.h Sat Nov 6 17:04:02 2004 @@ -1,12 +1,12 @@ ---- stlport/config/stlcomp.h.orig Wed Jul 24 02:21:28 2002 -+++ stlport/config/stlcomp.h Wed Jul 24 02:21:16 2002 -@@ -103,6 +103,9 @@ +--- stlport/config/stlcomp.h.orig Sun Nov 2 16:59:12 2003 ++++ stlport/config/stlcomp.h Sat Nov 6 16:13:47 2004 +@@ -109,6 +109,9 @@ # elif defined (__FCC_VERSION) /* Fujutsu Compiler, v4.0 assumed */ # include <config/stl_fujitsu.h> -+/* Intel(R) C++ Compiler */ +# elif defined (__ICC) ++/* Intel(R) C++ Compiler */ +# include <config/stl_icc.h> - # else - /* Unable to identify the compiler, issue error diagnostic. - * Edit <config/stl_mycomp.h> to set STLport up for your compiler. */ + # elif defined(_CRAY) + /* Cray C++ 3.4 or 3.5 */ + # include <config/stl_cray.h> diff -urN stlport.orig/files/patch-test::eh::gcc-freebsd.mak stlport/files/patch-test::eh::gcc-freebsd.mak --- stlport.orig/files/patch-test::eh::gcc-freebsd.mak Sat Nov 6 16:25:22 2004 +++ stlport/files/patch-test::eh::gcc-freebsd.mak Sat Nov 6 17:04:02 2004 @@ -1,5 +1,5 @@ ---- test/eh/gcc-freebsd.mak.orig Sat May 26 05:06:16 2001 -+++ test/eh/gcc-freebsd.mak Fri Jun 7 11:25:25 2002 +--- test/eh/gcc-freebsd.mak.orig Sun Nov 2 16:58:53 2003 ++++ test/eh/gcc-freebsd.mak Sat Nov 6 16:19:16 2004 @@ -34,20 +34,17 @@ D_TEST = ./eh_test_d.out NOSGI_TEST = ./eh_test_nosgi.out @@ -11,7 +11,7 @@ # also, test_slist won't compile with -O3/-O2 when targeting PPC. It fails # in the assembler with 'invalid relocation type' -CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -+CXXFLAGS += $(PTHREAD_CFLAGS) -D_REENTRANT -fexceptions -Wall $(STL_INCL) -I. $(CXX_EXTRA_FLAGS) -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC ++CXXFLAGS = $(PTHREAD_CFLAGS) -D_REENTRANT -fexceptions -Wall ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC -D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB -NOSGI_CXXFLAGS = -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411060931.iA69VcWn053019>