117 lines
4.5 KiB
Plaintext
117 lines
4.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.13 2013/04/18 11:31:37 ajacoutot Exp $
|
|
|
|
- Chunk 1, 2 & 6 : https://bugs.webkit.org/show_bug.cgi?id=109932
|
|
Only webkit2 requires c++11 features atm, so let's relax the check until we have webkit2
|
|
|
|
- Chunk 3 : GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD
|
|
glib commit 136e705e8383ff8848e425ac01278102d7badc52
|
|
|
|
- Chunk 7 : Don't force the use of -O2, the ports infrastructure
|
|
takes care of that
|
|
|
|
--- configure.orig Tue Apr 16 09:13:13 2013
|
|
+++ configure Thu Apr 18 08:10:25 2013
|
|
@@ -4721,7 +4721,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
-#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) \
|
|
+#if !(defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2) \
|
|
&& !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 0)
|
|
#error Unsupported compiler
|
|
#endif
|
|
@@ -4758,7 +4758,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
-#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 7) \
|
|
+#if !(defined(__GNUG__) && defined(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 2) \
|
|
&& !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 0)
|
|
#error Unsupported compiler
|
|
#endif
|
|
@@ -17495,26 +17495,14 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsetti
|
|
|
|
all-am: $(gsettings_SCHEMAS:.xml=.valid)
|
|
uninstall-am: uninstall-gsettings-schemas
|
|
-install-data-am: install-gsettings-schemas
|
|
+install-data-am:
|
|
|
|
.SECONDARY: $(gsettings_SCHEMAS)
|
|
|
|
-gsettings__base_list = \
|
|
- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
|
|
- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
|
|
-
|
|
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
|
|
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
|
|
@$(NORMAL_INSTALL)
|
|
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
|
|
- @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
|
|
- for p in $$list; do \
|
|
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
|
- echo "$$d$$p"; \
|
|
- done | $(gsettings__base_list) | \
|
|
- while read files; do \
|
|
- echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
|
|
- $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
|
|
- done
|
|
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
|
|
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
|
|
|
|
uninstall-gsettings-schemas:
|
|
@@ -20236,18 +20224,18 @@ fi
|
|
|
|
if test "$with_acceleration_backend" = "opengl"; then
|
|
if test "$enable_gles2" = "yes"; then
|
|
- acceleration_backend_description+= "(gles2"
|
|
+ acceleration_backend_description= "(gles2"
|
|
OPENGL_LIBS="-lGLESv2"
|
|
else
|
|
- acceleration_backend_description+="(gl"
|
|
+ acceleration_backend_description="(gl"
|
|
OPENGL_LIBS="-lGL"
|
|
fi
|
|
if test "$enable_egl" = "yes"; then
|
|
- acceleration_backend_description+=", egl"
|
|
- OPENGL_LIBS+=" -lEGL"
|
|
+ acceleration_backend_description="$acceleration_backend_description, egl"
|
|
+ OPENGL_LIBS="$OPENGL_LIBS -lEGL"
|
|
fi
|
|
if test "$enable_glx" = "yes"; then
|
|
- acceleration_backend_description+=", glx"
|
|
+ acceleration_backend_description="$acceleration_backend_description, glx"
|
|
fi
|
|
|
|
# Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
|
|
@@ -20300,8 +20288,8 @@ fi
|
|
|
|
|
|
|
|
- OPENGL_LIBS+=" $DLOPEN_LIBS"
|
|
- acceleration_backend_description+=")"
|
|
+ OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
|
|
+ acceleration_backend_description="$acceleration_backend_description)"
|
|
fi
|
|
|
|
|
|
@@ -21055,7 +21043,7 @@ fi
|
|
# Use C99 as the language standard for C code.
|
|
CFLAGS="$CFLAGS -std=c99"
|
|
# Do not warn about C++11 incompatibilities.
|
|
-CXXFLAGS="$CXXFLAGS -Wno-c++11-compat"
|
|
+# CXXFLAGS="$CXXFLAGS -Wno-c++11-compat"
|
|
|
|
# Clang requires suppression of unused arguments warning.
|
|
if test "$CC" = "clang"; then
|
|
@@ -21083,8 +21071,8 @@ fi
|
|
|
|
# Add the appropriate 'O' level for optimized builds.
|
|
if test "$enable_optimizations" = "yes"; then
|
|
- CXXFLAGS="$CXXFLAGS -O2"
|
|
- CFLAGS="$CFLAGS -O2"
|
|
+ CXXFLAGS="$CXXFLAGS"
|
|
+ CFLAGS="$CFLAGS"
|
|
else
|
|
CXXFLAGS="$CXXFLAGS -O0"
|
|
CFLAGS="$CFLAGS -O0"
|