Title: [165648] trunk
- Revision
- 165648
- Author
- commit-qu...@webkit.org
- Date
- 2014-03-14 14:20:11 -0700 (Fri, 14 Mar 2014)
Log Message
.: Add autotools boilerplate for proper os defines on OpenBSD/NetBSD/DragonFly
https://bugs.webkit.org/show_bug.cgi?id=129966
Patch by Landry Breuil <lan...@openbsd.org> on 2014-03-14
Reviewed by Andreas Kling.
* Source/autotools/CheckSystemAndBasicDependencies.m4:
* Source/autotools/SetupAutomake.m4:
Source/ThirdParty: Fix leveldb build on OpenBSD/NetBSD by using the FreeBSD codepaths.
https://bugs.webkit.org/show_bug.cgi?id=129966
Patch by Landry Breuil <lan...@openbsd.org> on 2014-03-14
Reviewed by Andreas Kling.
* leveldb/GNUmakefile.am:
* leveldb/port/port_posix.h:
Modified Paths
Diff
Modified: trunk/ChangeLog (165647 => 165648)
--- trunk/ChangeLog 2014-03-14 21:18:30 UTC (rev 165647)
+++ trunk/ChangeLog 2014-03-14 21:20:11 UTC (rev 165648)
@@ -1,3 +1,13 @@
+2014-03-14 Landry Breuil <lan...@openbsd.org>
+
+ Add autotools boilerplate for proper os defines on OpenBSD/NetBSD/DragonFly
+ https://bugs.webkit.org/show_bug.cgi?id=129966
+
+ Reviewed by Andreas Kling.
+
+ * Source/autotools/CheckSystemAndBasicDependencies.m4:
+ * Source/autotools/SetupAutomake.m4:
+
2014-03-13 Mario Sanchez Prada <mario.pr...@samsung.com>
[CMake] Failure to link with older installations of WebP
Modified: trunk/Source/ThirdParty/ChangeLog (165647 => 165648)
--- trunk/Source/ThirdParty/ChangeLog 2014-03-14 21:18:30 UTC (rev 165647)
+++ trunk/Source/ThirdParty/ChangeLog 2014-03-14 21:20:11 UTC (rev 165648)
@@ -1,3 +1,13 @@
+2014-03-14 Landry Breuil <lan...@openbsd.org>
+
+ Fix leveldb build on OpenBSD/NetBSD by using the FreeBSD codepaths.
+ https://bugs.webkit.org/show_bug.cgi?id=129966
+
+ Reviewed by Andreas Kling.
+
+ * leveldb/GNUmakefile.am:
+ * leveldb/port/port_posix.h:
+
2014-01-12 Andy Estes <aes...@apple.com>
Fix the Mac build after r161777.
Modified: trunk/Source/ThirdParty/leveldb/GNUmakefile.am (165647 => 165648)
--- trunk/Source/ThirdParty/leveldb/GNUmakefile.am 2014-03-14 21:18:30 UTC (rev 165647)
+++ trunk/Source/ThirdParty/leveldb/GNUmakefile.am 2014-03-14 21:20:11 UTC (rev 165648)
@@ -30,6 +30,21 @@
-DOS_FREEBSD
endif
+if OS_NETBSD
+libLevelDB_la_CPPFLAGS += \
+ -DOS_NETBSD
+endif
+
+if OS_OPENBSD
+libLevelDB_la_CPPFLAGS += \
+ -DOS_OPENBSD
+endif
+
+if OS_DRAGONFLY
+libLevelDB_la_CPPFLAGS += \
+ -DOS_DRAGONFLY
+endif
+
if OS_DARWIN
libLevelDB_la_CPPFLAGS += \
-DOS_MACOSX
Modified: trunk/Source/ThirdParty/leveldb/port/port_posix.h (165647 => 165648)
--- trunk/Source/ThirdParty/leveldb/port/port_posix.h 2014-03-14 21:18:30 UTC (rev 165647)
+++ trunk/Source/ThirdParty/leveldb/port/port_posix.h 2014-03-14 21:20:11 UTC (rev 165648)
@@ -21,14 +21,11 @@
#else
#define PLATFORM_IS_LITTLE_ENDIAN false
#endif
-#elif defined(OS_FREEBSD)
- #include <sys/types.h>
- #include <sys/endian.h>
- #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
#elif defined(OS_OPENBSD) || defined(OS_NETBSD) ||\
- defined(OS_DRAGONFLYBSD)
+ defined(OS_FREEBSD) || defined(OS_DRAGONFLY)
#include <sys/types.h>
#include <sys/endian.h>
+ #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
#elif defined(OS_HPUX)
#define PLATFORM_IS_LITTLE_ENDIAN false
#elif defined(OS_ANDROID)
@@ -54,7 +51,7 @@
#endif
#if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD) ||\
- defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD) ||\
+ defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLY) ||\
defined(OS_ANDROID) || defined(OS_HPUX)
// Use fread/fwrite/fflush on platforms without _unlocked variants
#define fread_unlocked fread
@@ -63,7 +60,7 @@
#endif
#if defined(OS_MACOSX) || defined(OS_FREEBSD) ||\
- defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD)
+ defined(OS_OPENBSD) || defined(OS_DRAGONFLY)
// Use fsync() on platforms without fdatasync()
#define fdatasync fsync
#endif
Modified: trunk/Source/autotools/CheckSystemAndBasicDependencies.m4 (165647 => 165648)
--- trunk/Source/autotools/CheckSystemAndBasicDependencies.m4 2014-03-14 21:18:30 UTC (rev 165647)
+++ trunk/Source/autotools/CheckSystemAndBasicDependencies.m4 2014-03-14 21:20:11 UTC (rev 165648)
@@ -3,6 +3,9 @@
os_win32=no
os_linux=no
os_freebsd=no
+os_openbsd=no
+os_netbsd=no
+os_dragonfly=no
os_gnu=no
case "$host_os" in
@@ -12,6 +15,15 @@
freebsd*)
os_freebsd=yes
;;
+ openbsd*)
+ os_openbsd=yes
+ ;;
+ netbsd*)
+ os_netbsd=yes
+ ;;
+ dragonfly*)
+ os_dragonfly=yes
+ ;;
linux*)
os_linux=yes
os_gnu=yes
Modified: trunk/Source/autotools/SetupAutomake.m4 (165647 => 165648)
--- trunk/Source/autotools/SetupAutomake.m4 2014-03-14 21:18:30 UTC (rev 165647)
+++ trunk/Source/autotools/SetupAutomake.m4 2014-03-14 21:20:11 UTC (rev 165648)
@@ -21,6 +21,9 @@
AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"])
AM_CONDITIONAL([OS_DARWIN],[test "$os_darwin" = "yes"])
AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
+AM_CONDITIONAL([OS_OPENBSD],[test "$os_openbsd" = "yes"])
+AM_CONDITIONAL([OS_NETBSD],[test "$os_netbsd" = "yes"])
+AM_CONDITIONAL([OS_DRAGONFLY],[test "$os_dragonfly" = "yes"])
AM_CONDITIONAL([COMPILER_GCC],[test "$c_compiler" = "gcc" && test "$cxx_compiler" = "g++"])
AM_CONDITIONAL([COMPILER_CLANG],[test "$c_compiler" = "clang" && test "$cxx_compiler" = "clang++"])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
