Attachment #189216 for bug #224372

Lines 16-22 Link Here

(-)games/oolite/Makefile (-5 / +12 lines)
16	LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKSRC}/Doc/LICENSE.TXT	16	LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKSRC}/Doc/LICENSE.TXT
17		17
18	BUILD_DEPENDS= zip:archivers/zip \	18	BUILD_DEPENDS= zip:archivers/zip \
19	${LOCALBASE}/bin/unzip:archivers/unzip	19	${LOCALBASE}/bin/unzip:archivers/unzip \
		20	autoconf-2.13:devel/autoconf213
20	LIB_DEPENDS= libespeak.so:audio/espeak \	21	LIB_DEPENDS= libespeak.so:audio/espeak \
21	libnspr4.so:devel/nspr \	22	libnspr4.so:devel/nspr \
22	libvorbisfile.so:audio/libvorbis \	23	libvorbisfile.so:audio/libvorbis \
Lines 51-60 Link Here
51		52
52	OPTIONS_DEFINE= DOCS	53	OPTIONS_DEFINE= DOCS
53		54
54	BROKEN_aarch64= fails to configure: error: These compiler flags are invalid: -O
55	BROKEN_armv6= fails to compile: your compiler does not follow the C++ specification for temporary object destruction order
56	BROKEN_armv7= fails to compile: your compiler does not follow the C++ specification for temporary object destruction order
57
58	post-patch: .SILENT	55	post-patch: .SILENT
59	${REINPLACE_CMD} -e 's/GNUSTEP_USER_ROOT/GNUSTEP_LOCAL_ROOT/ ; \	56	${REINPLACE_CMD} -e 's/GNUSTEP_USER_ROOT/GNUSTEP_LOCAL_ROOT/ ; \
60	s/sdl-config/$${SDL_CONFIG}/ ; \	57	s/sdl-config/$${SDL_CONFIG}/ ; \
Lines 65-74 Link Here
65	/ioapi.c/d ; /unzip.c/d ; \	62	/ioapi.c/d ; /unzip.c/d ; \
66	s\|/usr/X11R6\|$${LOCALBASE}\|' \	63	s\|/usr/X11R6\|$${LOCALBASE}\|' \
67	${WRKSRC}/GNUmakefile	64	${WRKSRC}/GNUmakefile
		65	${REINPLACE_CMD} -e 's\|--with-system-nspr\|& --with-pthreads\|' \
		66	${WRKSRC}/libjs.make
68	# Change value of the SAVEDIR define	67	# Change value of the SAVEDIR define
69	${REINPLACE_CMD} -e 's\|oolite-saves\|\.oolite-saves\|' \	68	${REINPLACE_CMD} -e 's\|oolite-saves\|\.oolite-saves\|' \
70	${WRKSRC}/src/Core/NSFileManagerOOExtensions.h	69	${WRKSRC}/src/Core/NSFileManagerOOExtensions.h
71		70
		71	pre-configure:
		72	(cd ${WRKSRC}/deps/mozilla/js/src && ${LOCALBASE}/bin/autoconf-2.13)
		73
		74	# This comes from bsd.gecko.mk, fixes linking issues on 9.0 and higher.
		75	post-configure:
		76	${ECHO_CMD} "fenv.h" >> ${WRKSRC}/deps/mozilla/js/src/config/system-headers
		77	${ECHO_CMD} "pthread_np.h" >> ${WRKSRC}/deps/mozilla/js/src/config/system-headers
		78
72	do-install:	79	do-install:
73	(cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})	80	(cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
74	${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin	81	${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin




--- 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




--- 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__)




--- 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'




--- deps/mozilla/js/src/configure.in.orig	2014-05-17 17:57:43 UTC
+++ deps/mozilla/js/src/configure.in
@@ -3378,7 +3378,8 @@ EOF
                        rm -f conftest.{c,S}
                        ])
         if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \

           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,

Line 0 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_nanojit_CodeAlloc.cpp (+10 lines)
	1	--- deps/mozilla/js/src/nanojit/CodeAlloc.cpp.orig 2014-05-17 17:57:43 UTC
	2	+++ deps/mozilla/js/src/nanojit/CodeAlloc.cpp
	3	@@ -261,7 +261,6 @@ namespace nanojit
	4	#endif
	5
	6	#if defined(AVMPLUS_UNIX) && defined(NANOJIT_ARM)
	7	-#include <asm/unistd.h>
	8	extern "C" void __clear_cache(char BEG, char END);
	9	#endif
	10

Line 0 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_nanojit_njcpudetect.h (+11 lines)
	1	--- deps/mozilla/js/src/nanojit/njcpudetect.h.orig 2014-05-17 17:57:43 UTC
	2	+++ deps/mozilla/js/src/nanojit/njcpudetect.h
	3	@@ -77,6 +77,8 @@
	4	#elif defined(__ARM_ARCH_6__) \|\| \
	5	defined(__ARM_ARCH_6J__) \|\| \
	6	defined(__ARM_ARCH_6T2__) \|\| \
	7	+ defined(__ARM_ARCH_6K__) \|\| \
	8	+ defined(__ARM_ARCH_6KZ__) \|\| \
	9	defined(__ARM_ARCH_6Z__) \|\| \
	10	defined(__ARM_ARCH_6ZK__) \|\| \
	11	defined(__ARM_ARCH_6M__) \|\| \

Return to bug 224372

Line 0 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_nanojit_njcpudetect.h (+11 lines)
	1	--- deps/mozilla/js/src/nanojit/njcpudetect.h.orig 2014-05-17 17:57:43 UTC
	2	+++ deps/mozilla/js/src/nanojit/njcpudetect.h
	3	@@ -77,6 +77,8 @@
	4	#elif defined(__ARM_ARCH_6__) \|\| \
	5	defined(__ARM_ARCH_6J__) \|\| \
	6	defined(__ARM_ARCH_6T2__) \|\| \
	7	+ defined(__ARM_ARCH_6K__) \|\| \
	8	+ defined(__ARM_ARCH_6KZ__) \|\| \
	9	defined(__ARM_ARCH_6Z__) \|\| \
	10	defined(__ARM_ARCH_6ZK__) \|\| \
	11	defined(__ARM_ARCH_6M__) \|\| \

Line 0 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_assembler_jit_ExecutableAllocator.h (+14 lines)
	1	--- deps/mozilla/js/src/assembler/jit/ExecutableAllocator.h.orig 2014-05-17 17:57:43 UTC
	2	+++ deps/mozilla/js/src/assembler/jit/ExecutableAllocator.h
	3	@@ -391,6 +391,11 @@ public:
	4	{
	5	CacheRangeFlush(code, size, CACHE_SYNC_ALL);
	6	}
	7	+#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_FREEBSD
	8	+ static void cacheFlush(void* code, size_t size)
	9	+ {
	10	+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
	11	+ }
	12	#else
	13	#error "The cacheFlush support is missing on this platform."
	14	#endif

Line 0 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_assembler_wtf_Platform.h (+18 lines)
	1	--- deps/mozilla/js/src/assembler/wtf/Platform.h.orig 2014-05-17 17:57:43 UTC
	2	+++ deps/mozilla/js/src/assembler/wtf/Platform.h
	3	@@ -213,6 +213,7 @@
	4	#elif defined(__ARM_ARCH_6__) \
	5	\|\| defined(__ARM_ARCH_6J__) \
	6	\|\| defined(__ARM_ARCH_6K__) \
	7	+ \|\| defined(__ARM_ARCH_6KZ__) \
	8	\|\| defined(__ARM_ARCH_6Z__) \
	9	\|\| defined(__ARM_ARCH_6ZK__) \
	10	\|\| defined(__ARM_ARCH_6T2__) \
	11	@@ -243,6 +244,7 @@
	12
	13	#elif defined(__ARM_ARCH_6J__) \
	14	\|\| defined(__ARM_ARCH_6K__) \
	15	+ \|\| defined(__ARM_ARCH_6KZ__) \
	16	\|\| defined(__ARM_ARCH_6Z__) \
	17	\|\| defined(__ARM_ARCH_6ZK__) \
	18	\|\| defined(__ARM_ARCH_6M__)

Lines 1-12 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_configure (-12 lines)
1	--- deps/mozilla/js/src/configure.orig 2014-06-30 08:54:39 UTC
2	+++ deps/mozilla/js/src/configure
3	@@ -9547,7 +9547,8 @@
4
5	echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6
6	if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
7	- "$ac_cv_have_visibility_class_bug" = "no"; then
8	+ "$ac_cv_have_visibility_class_bug" = "no" -a \
9	+ "$OS_ARCH" != "FreeBSD" ; then
10	VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
11	WRAP_SYSTEM_INCLUDES=1
12	STL_FLAGS='-I$(DIST)/stl_wrappers'

Lines 1-6 Link Here

(-)games/oolite/files/patch-deps_mozilla_js_src_configure.in (-2 / +35 lines)
1	--- deps/mozilla/js/src/configure.in.orig 2014-06-30 08:54:39 UTC	1	--- deps/mozilla/js/src/configure.in.orig 2014-05-17 17:57:43 UTC
2	+++ deps/mozilla/js/src/configure.in	2	+++ deps/mozilla/js/src/configure.in
3	@@ -3378,7 +3378,8 @@	3	@@ -3378,7 +3378,8 @@ EOF
4	rm -f conftest.{c,S}	4	rm -f conftest.{c,S}
5	])	5	])
6	if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \	6	if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
Lines 10-12 Link Here
10	VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'	10	VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
11	WRAP_SYSTEM_INCLUDES=1	11	WRAP_SYSTEM_INCLUDES=1
12	STL_FLAGS='-I$(DIST)/stl_wrappers'	12	STL_FLAGS='-I$(DIST)/stl_wrappers'
		13	@@ -4656,6 +4657,9 @@ MOZ_ARG_HEADER(Individual module options
		14
		15	dnl Setup default CPU arch for arm target
		16	case "$target_cpu" in
		17	+ armv6*)
		18	+ MOZ_ARM_ARCH=armv6
		19	+ ;;
		20	arm*)
		21	MOZ_ARM_ARCH=armv7
		22	;;
		23	@@ -4716,6 +4720,13 @@ elif test "$MOZ_ARM_ARCH" = "armv7"; the
		24	esac
		25	else
		26	case "$target_cpu" in
		27	+ armv6*)
		28	+ if test "$GNU_CC"; then
		29	+ CFLAGS="$CFLAGS"
		30	+ CXXFLAGS="$CXXFLAGS"
		31	+ ASFLAGS="$ASFLAGS"
		32	+ fi
		33	+ ;;
		34	arm*)
		35	if test "$GNU_CC"; then
		36	CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
		37	@@ -4788,7 +4799,7 @@ dnl ====================================
		38	dnl = Enable code optimization. ON by default.
		39	dnl ========================================================
		40	if test -z "$MOZ_OPTIMIZE_FLAGS"; then
		41	- MOZ_OPTIMIZE_FLAGS="-O"
		42	+ MOZ_OPTIMIZE_FLAGS="-O2"
		43	fi
		44
		45	MOZ_ARG_ENABLE_STRING(optimize,