diff options
| author | mbr <mbr@FreeBSD.org> | 2002-06-07 18:37:50 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-06-07 18:37:50 +0800 |
| commit | 97994cf86f370919f019d7b43efc7be012567016 (patch) | |
| tree | b7d4ec55f6f6a1682c3f37545867c7d345804efc | |
| parent | 672a4013c332635fa5ee0a54105f1b83dc941293 (diff) | |
| download | freebsd-ports-gnome-97994cf86f370919f019d7b43efc7be012567016.tar.gz freebsd-ports-gnome-97994cf86f370919f019d7b43efc7be012567016.tar.zst freebsd-ports-gnome-97994cf86f370919f019d7b43efc7be012567016.zip | |
- -D_REENTRANT is still needed. For STABLE and CURRENT.
- Delete obsoleted patch
| -rw-r--r-- | devel/stlport/files/patch-src::gcc-freebsd.mak | 4 | ||||
| -rw-r--r-- | devel/stlport/files/patch-test::eh::gcc-freebsd.mak | 6 | ||||
| -rw-r--r-- | devel/stlport/files/patch-tests::eh::gcc-freebsd.mak | 14 |
3 files changed, 5 insertions, 19 deletions
diff --git a/devel/stlport/files/patch-src::gcc-freebsd.mak b/devel/stlport/files/patch-src::gcc-freebsd.mak index 91bcfb044902..d52bacd145e9 100644 --- a/devel/stlport/files/patch-src::gcc-freebsd.mak +++ b/devel/stlport/files/patch-src::gcc-freebsd.mak @@ -6,8 +6,8 @@ # -CC = gcc -pthread -CXX = c++ -pthread -fexceptions -+CC+= ${PTHREAD_CFLAGS} -+CXX+= ${PTHREAD_CFLAGS} -fexceptions ++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT ++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions # # Basename for libraries diff --git a/devel/stlport/files/patch-test::eh::gcc-freebsd.mak b/devel/stlport/files/patch-test::eh::gcc-freebsd.mak index 9d3f83c0517a..7ec598b30717 100644 --- a/devel/stlport/files/patch-test::eh::gcc-freebsd.mak +++ b/devel/stlport/files/patch-test::eh::gcc-freebsd.mak @@ -11,12 +11,12 @@ # 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) -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW ++CXXFLAGS= $(PTHREAD_CFLAGS) -D_REENTRANT -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -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 -+D_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB -+NOSGI_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW ++D_CXXFLAGS = $(PTHREAD_CFLAGS) -D_REENTRANT -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB ++NOSGI_CXXFLAGS = $(PTHREAD_CFLAGS) -D_REENTRANT -Wall -g -O2 ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -D_STLP_NO_OWN_IOSTREAMS -D_STLP_DEBUG_UNINITIALIZED -DEH_VECTOR_OPERATOR_NEW check: $(TEST) diff --git a/devel/stlport/files/patch-tests::eh::gcc-freebsd.mak b/devel/stlport/files/patch-tests::eh::gcc-freebsd.mak deleted file mode 100644 index b90b5f17195b..000000000000 --- a/devel/stlport/files/patch-tests::eh::gcc-freebsd.mak +++ /dev/null @@ -1,14 +0,0 @@ ---- test/eh/gcc-freebsd.mak.orig Tue Mar 5 08:57:04 2002 -+++ test/eh/gcc-freebsd.mak Tue Mar 5 08:57:34 2002 -@@ -40,9 +40,9 @@ - # dwa 12/22/99 -- had to turn off -ansi flag so we could use SGI IOSTREAMS - # 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 = -Wall -g ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW - --D_CXXFLAGS = -Wall -g -O ${STL_INCL} -I. ${CXX_EXTRA_FLAGS} -DEH_VECTOR_OPERATOR_NEW -D_STLP_DEBUG -D_STLP_USE_STATIC_LIB -+D_CXXFLAGS = -Wall -g ${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 - - check: $(TEST) |