Attachment 170915 Details for Bug 209937 – patch that upgrade port

[patch] patch that upgrade port

patch-devel_libcxxrt.UPGRADE.diff (text/plain), 4.86 KB, created by Mahdi Mokhtari on 2016-06-01 14:33:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2016-06-01 14:33:17 UTC

Size: 4.86 KB

patch

obsolete

>Index: devel/libcxxrt/Makefile
>===================================================================
>--- devel/libcxxrt/Makefile	(revision 416235)
>+++ devel/libcxxrt/Makefile	(working copy)
>@@ -1,22 +1,21 @@
> # $FreeBSD$
> 
>-PORTNAME=	libcxxrt
>-PORTVERSION=	20131225
>-PORTREVISION=	3
>-CATEGORIES=	devel
>+PORTNAME=		libcxxrt
>+PORTVERSION=	20160529
>+CATEGORIES=		devel
> 
>-MAINTAINER=	mokhi64@gmail.com
>-COMMENT=	Implementation of the Code Sourcery C++ ABI
>+MAINTAINER=		mokhi64@gmail.com
>+COMMENT=		Implementation of the Code Sourcery C++ ABI
> 
>-LICENSE=	BSD2CLAUSE
>+LICENSE=		BSD2CLAUSE
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	pathscale
>-GH_TAGNAME=	2f150a6
>+USE_GITHUB=		yes
>+GH_ACCOUNT=		pathscale
>+GH_TAGNAME=		516a65c
> 
>-USES=		cmake compiler:c++11-lang
>+USES=			cmake compiler:c++11-lang
> USE_LDCONFIG=	yes
>-CXXFLAGS+=	-nostdlib
>+CXXFLAGS+=		-nostdlib
> 
> do-install:
> 	${INSTALL_LIB} ${WRKSRC}/lib/libcxxrt.so ${STAGEDIR}${PREFIX}/lib
>Index: devel/libcxxrt/distinfo
>===================================================================
>--- devel/libcxxrt/distinfo	(revision 416235)
>+++ devel/libcxxrt/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pathscale-libcxxrt-20131225-2f150a6_GH0.tar.gz) = 70a89c34176d2bc683b5a3b84fea8d585bcf53c6b09d0efedbac3caf315b4fc1
>-SIZE (pathscale-libcxxrt-20131225-2f150a6_GH0.tar.gz) = 70243
>+SHA256 (pathscale-libcxxrt-20160529-516a65c_GH0.tar.gz) = 5d2b943fb8bcce453d3453246dd25242a01b2107631c52c90dbefff13fec1f65
>+SIZE (pathscale-libcxxrt-20160529-516a65c_GH0.tar.gz) = 73293
>Index: devel/libcxxrt/files/patch-src_exception.cc
>===================================================================
>--- devel/libcxxrt/files/patch-src_exception.cc	(revision 416235)
>+++ devel/libcxxrt/files/patch-src_exception.cc	(nonexistent)
>@@ -1,48 +0,0 @@
>---- src/exception.cc.orig	2013-12-26 03:11:27 UTC
>-+++ src/exception.cc
>-@@ -304,13 +304,17 @@ static pthread_key_t eh_key;
>- static void exception_cleanup(_Unwind_Reason_Code reason, 
>-                               struct _Unwind_Exception *ex)
>- {
>--	__cxa_free_exception(static_cast<void*>(ex));
>-+	// Exception layout:
>-+	// [__cxa_exception [_Unwind_Exception]] [exception object]
>-+	//
>-+	// __cxa_free_exception expects a pointer to the exception object
>-+	__cxa_free_exception(static_cast<void*>(ex + 1));
>- }
>- static void dependent_exception_cleanup(_Unwind_Reason_Code reason, 
>-                               struct _Unwind_Exception *ex)
>- {
>- 
>--	__cxa_free_dependent_exception(static_cast<void*>(ex));
>-+	__cxa_free_dependent_exception(static_cast<void*>(ex + 1));
>- }
>- 
>- /**
>-@@ -340,7 +344,8 @@ static void thread_cleanup(void* thread_
>- 		if (info->foreign_exception_state != __cxa_thread_info::none)
>- 		{
>- 			_Unwind_Exception *e = reinterpret_cast<_Unwind_Exception*>(info->globals.caughtExceptions);
>--			e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
>-+			if (e->exception_cleanup)
>-+				e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
>- 		}
>- 		else
>- 		{
>-@@ -1270,12 +1275,13 @@ extern "C" void __cxa_end_catch()
>- 	
>- 	if (ti->foreign_exception_state != __cxa_thread_info::none)
>- 	{
>--		globals->caughtExceptions = 0;
>- 		if (ti->foreign_exception_state != __cxa_thread_info::rethrown)
>- 		{
>- 			_Unwind_Exception *e = reinterpret_cast<_Unwind_Exception*>(ti->globals.caughtExceptions);
>--			e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
>-+			if (e->exception_cleanup)
>-+				e->exception_cleanup(_URC_FOREIGN_EXCEPTION_CAUGHT, e);
>- 		}
>-+		globals->caughtExceptions = 0;
>- 		ti->foreign_exception_state = __cxa_thread_info::none;
>- 		return;
>- 	}
>Index: devel/libcxxrt/files/patch-test_CMakeLists.txt
>===================================================================
>--- devel/libcxxrt/files/patch-test_CMakeLists.txt	(revision 416235)
>+++ devel/libcxxrt/files/patch-test_CMakeLists.txt	(nonexistent)
>@@ -1,24 +0,0 @@
>---- test/CMakeLists.txt.orig	2013-12-26 03:11:27 UTC
>-+++ test/CMakeLists.txt
>-@@ -23,6 +23,11 @@ add_executable(cxxrt-test-shared ${CXXTE
>- set_property(TARGET cxxrt-test-shared PROPERTY LINK_FLAGS -nodefaultlibs)
>- target_link_libraries(cxxrt-test-shared cxxrt-shared pthread dl c)
>- 
>-+include_directories(${CMAKE_SOURCE_DIR}/src)
>-+add_executable(cxxrt-test-foreign-exceptions test_foreign_exceptions.cc)
>-+set_property(TARGET cxxrt-test-foreign-exceptions PROPERTY LINK_FLAGS "-nodefaultlibs -Wl,--wrap,_Unwind_RaiseException")
>-+target_link_libraries(cxxrt-test-foreign-exceptions cxxrt-static gcc_s pthread dl c)
>-+
>- add_test(cxxrt-test-static-test
>-          ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
>-          ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-static
>-@@ -35,6 +40,9 @@ add_test(cxxrt-test-shared-test
>-          ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log
>-          ${CMAKE_CURRENT_BINARY_DIR}/test-shared-output.log)
>- 
>-+add_test(cxxrt-test-foreign-exceptions
>-+         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-foreign-exceptions)
>-+
>- set(valgrind "valgrind -q")
>- 
>- if(TEST_VALGRIND)

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 209937: 170915