Attachment 189216 Details for Bug 224372 – Proposed patch (since 457594 revision)

[patch] Proposed patch (since 457594 revision)

oolite.diff (text/plain), 7.68 KB, created by lightside on 2017-12-30 10:39:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2017-12-30 10:39:09 UTC

Size: 7.68 KB

patch

obsolete

>Index: games/oolite/Makefile
>===================================================================
>--- games/oolite/Makefile	(revision 457597)
>+++ games/oolite/Makefile	(working copy)
>@@ -16,7 +16,8 @@
> LICENSE_FILE_CC-BY-NC-SA-3.0=	${WRKSRC}/Doc/LICENSE.TXT
> 
> BUILD_DEPENDS=		zip:archivers/zip \
>-			${LOCALBASE}/bin/unzip:archivers/unzip
>+			${LOCALBASE}/bin/unzip:archivers/unzip \
>+			autoconf-2.13:devel/autoconf213
> LIB_DEPENDS=		libespeak.so:audio/espeak \
> 			libnspr4.so:devel/nspr \
> 			libvorbisfile.so:audio/libvorbis \
>@@ -51,10 +52,6 @@
> 
> OPTIONS_DEFINE=	DOCS
> 
>-BROKEN_aarch64=		fails to configure: error: These compiler flags are invalid: -O
>-BROKEN_armv6=		fails to compile: your compiler does not follow the C++ specification for temporary object destruction order
>-BROKEN_armv7=		fails to compile: your compiler does not follow the C++ specification for temporary object destruction order
>-
> post-patch: .SILENT
> 	${REINPLACE_CMD} -e 's/GNUSTEP_USER_ROOT/GNUSTEP_LOCAL_ROOT/ ; \
> 		s/sdl-config/$${SDL_CONFIG}/ ; \
>@@ -65,10 +62,20 @@
> 		/ioapi.c/d ; /unzip.c/d ; \
> 		s|/usr/X11R6|$${LOCALBASE}|' \
> 		${WRKSRC}/GNUmakefile
>+	${REINPLACE_CMD} -e 's|--with-system-nspr|& --with-pthreads|' \
>+		${WRKSRC}/libjs.make
> # Change value of the SAVEDIR define
> 	${REINPLACE_CMD} -e 's|oolite-saves|\.oolite-saves|' \
> 		${WRKSRC}/src/Core/NSFileManagerOOExtensions.h
> 
>+pre-configure:
>+	(cd ${WRKSRC}/deps/mozilla/js/src && ${LOCALBASE}/bin/autoconf-2.13)
>+
>+# This comes from bsd.gecko.mk, fixes linking issues on 9.0 and higher.
>+post-configure:
>+	${ECHO_CMD} "fenv.h" >> ${WRKSRC}/deps/mozilla/js/src/config/system-headers
>+	${ECHO_CMD} "pthread_np.h" >> ${WRKSRC}/deps/mozilla/js/src/config/system-headers
>+
> do-install:
> 	(cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
> 	${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin
>Index: games/oolite/files/patch-deps_mozilla_js_src_assembler_jit_ExecutableAllocator.h
>===================================================================
>--- games/oolite/files/patch-deps_mozilla_js_src_assembler_jit_ExecutableAllocator.h	(nonexistent)
>+++ games/oolite/files/patch-deps_mozilla_js_src_assembler_jit_ExecutableAllocator.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- deps/mozilla/js/src/assembler/jit/ExecutableAllocator.h.orig	2014-05-17 17:57:43 UTC
>++++ deps/mozilla/js/src/assembler/jit/ExecutableAllocator.h
>+@@ -391,6 +391,11 @@ public:
>+     {
>+         CacheRangeFlush(code, size, CACHE_SYNC_ALL);
>+     }
>++#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_FREEBSD
>++    static void cacheFlush(void* code, size_t size)
>++    {
>++	__clear_cache(code, reinterpret_cast<char*>(code) + size);
>++    }
>+ #else
>+     #error "The cacheFlush support is missing on this platform."
>+ #endif
>Index: games/oolite/files/patch-deps_mozilla_js_src_assembler_wtf_Platform.h
>===================================================================
>--- games/oolite/files/patch-deps_mozilla_js_src_assembler_wtf_Platform.h	(nonexistent)
>+++ games/oolite/files/patch-deps_mozilla_js_src_assembler_wtf_Platform.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- deps/mozilla/js/src/assembler/wtf/Platform.h.orig	2014-05-17 17:57:43 UTC
>++++ deps/mozilla/js/src/assembler/wtf/Platform.h
>+@@ -213,6 +213,7 @@
>+ #elif defined(__ARM_ARCH_6__) \
>+    || defined(__ARM_ARCH_6J__) \
>+    || defined(__ARM_ARCH_6K__) \
>++   || defined(__ARM_ARCH_6KZ__) \
>+    || defined(__ARM_ARCH_6Z__) \
>+    || defined(__ARM_ARCH_6ZK__) \
>+    || defined(__ARM_ARCH_6T2__) \
>+@@ -243,6 +244,7 @@
>+ 
>+ #elif defined(__ARM_ARCH_6J__) \
>+    || defined(__ARM_ARCH_6K__) \
>++   || defined(__ARM_ARCH_6KZ__) \
>+    || defined(__ARM_ARCH_6Z__) \
>+    || defined(__ARM_ARCH_6ZK__) \
>+    || defined(__ARM_ARCH_6M__)
>Index: games/oolite/files/patch-deps_mozilla_js_src_configure
>===================================================================
>--- games/oolite/files/patch-deps_mozilla_js_src_configure	(revision 457597)
>+++ games/oolite/files/patch-deps_mozilla_js_src_configure	(nonexistent)
>@@ -1,12 +0,0 @@
>---- deps/mozilla/js/src/configure.orig	2014-06-30 08:54:39 UTC
>-+++ deps/mozilla/js/src/configure
>-@@ -9547,7 +9547,8 @@
>- 
>- echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
>-         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
>--                "$ac_cv_have_visibility_class_bug" = "no"; then
>-+                "$ac_cv_have_visibility_class_bug" = "no" -a \
>-+		"$OS_ARCH" != "FreeBSD" ; then
>-           VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
>-           WRAP_SYSTEM_INCLUDES=1
>-           STL_FLAGS='-I$(DIST)/stl_wrappers'
>Index: games/oolite/files/patch-deps_mozilla_js_src_configure.in
>===================================================================
>--- games/oolite/files/patch-deps_mozilla_js_src_configure.in	(revision 457597)
>+++ games/oolite/files/patch-deps_mozilla_js_src_configure.in	(working copy)
>@@ -1,6 +1,6 @@
>---- deps/mozilla/js/src/configure.in.orig	2014-06-30 08:54:39 UTC
>+--- deps/mozilla/js/src/configure.in.orig	2014-05-17 17:57:43 UTC
> +++ deps/mozilla/js/src/configure.in
>-@@ -3378,7 +3378,8 @@
>+@@ -3378,7 +3378,8 @@ EOF
>                         rm -f conftest.{c,S}
>                         ])
>          if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
>@@ -10,3 +10,36 @@
>            VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
>            WRAP_SYSTEM_INCLUDES=1
>            STL_FLAGS='-I$(DIST)/stl_wrappers'
>+@@ -4656,6 +4657,9 @@ MOZ_ARG_HEADER(Individual module options
>+ 
>+ dnl Setup default CPU arch for arm target
>+ case "$target_cpu" in
>++  armv6*)
>++    MOZ_ARM_ARCH=armv6
>++  ;;
>+   arm*)
>+     MOZ_ARM_ARCH=armv7
>+   ;;
>+@@ -4716,6 +4720,13 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
>+   esac
>+ else
>+   case "$target_cpu" in
>++    armv6*)
>++      if test "$GNU_CC"; then
>++        CFLAGS="$CFLAGS"
>++        CXXFLAGS="$CXXFLAGS"
>++        ASFLAGS="$ASFLAGS"
>++      fi
>++      ;;
>+     arm*)
>+       if test "$GNU_CC"; then
>+         CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
>+@@ -4788,7 +4799,7 @@ dnl ====================================
>+ dnl = Enable code optimization. ON by default.
>+ dnl ========================================================
>+ if test -z "$MOZ_OPTIMIZE_FLAGS"; then
>+-	MOZ_OPTIMIZE_FLAGS="-O"
>++	MOZ_OPTIMIZE_FLAGS="-O2"
>+ fi
>+ 
>+ MOZ_ARG_ENABLE_STRING(optimize,
>Index: games/oolite/files/patch-deps_mozilla_js_src_nanojit_CodeAlloc.cpp
>===================================================================
>--- games/oolite/files/patch-deps_mozilla_js_src_nanojit_CodeAlloc.cpp	(nonexistent)
>+++ games/oolite/files/patch-deps_mozilla_js_src_nanojit_CodeAlloc.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- deps/mozilla/js/src/nanojit/CodeAlloc.cpp.orig	2014-05-17 17:57:43 UTC
>++++ deps/mozilla/js/src/nanojit/CodeAlloc.cpp
>+@@ -261,7 +261,6 @@ namespace nanojit
>+ #endif
>+ 
>+ #if defined(AVMPLUS_UNIX) && defined(NANOJIT_ARM)
>+-#include <asm/unistd.h>
>+ extern "C" void __clear_cache(char *BEG, char *END);
>+ #endif
>+ 
>Index: games/oolite/files/patch-deps_mozilla_js_src_nanojit_njcpudetect.h
>===================================================================
>--- games/oolite/files/patch-deps_mozilla_js_src_nanojit_njcpudetect.h	(nonexistent)
>+++ games/oolite/files/patch-deps_mozilla_js_src_nanojit_njcpudetect.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- deps/mozilla/js/src/nanojit/njcpudetect.h.orig	2014-05-17 17:57:43 UTC
>++++ deps/mozilla/js/src/nanojit/njcpudetect.h
>+@@ -77,6 +77,8 @@
>+ #elif   defined(__ARM_ARCH_6__) || \
>+         defined(__ARM_ARCH_6J__) || \
>+         defined(__ARM_ARCH_6T2__) || \
>++        defined(__ARM_ARCH_6K__) || \
>++        defined(__ARM_ARCH_6KZ__) || \
>+         defined(__ARM_ARCH_6Z__) || \
>+         defined(__ARM_ARCH_6ZK__) || \
>+         defined(__ARM_ARCH_6M__) || \

Actions: View | Diff

Attachments on bug 224372: 188867 | 189142 | 189216 | 194191 | 194193