You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/05/04 19:58:25 UTC
[lucy-commits] [1/4] git commit: refs/heads/master - Fix Cygwin detection
Updated Branches:
refs/heads/master b2e42b386 -> 271bd85dd
Fix Cygwin detection
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/c8ebd584
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/c8ebd584
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/c8ebd584
Branch: refs/heads/master
Commit: c8ebd584a1e55dcd7526a7bf4452abaf55c5f97c
Parents: b2e42b3
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 4 18:18:09 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 4 18:18:09 2013 +0200
----------------------------------------------------------------------
charmonizer/src/Charmonizer/Core/Compiler.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/c8ebd584/charmonizer/src/Charmonizer/Core/Compiler.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/Compiler.c b/charmonizer/src/Charmonizer/Core/Compiler.c
index 2130b47..22390b4 100644
--- a/charmonizer/src/Charmonizer/Core/Compiler.c
+++ b/charmonizer/src/Charmonizer/Core/Compiler.c
@@ -364,7 +364,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {
[lucy-commits] [3/4] git commit: refs/heads/master - Regenerate charmonizer.c
Posted by nw...@apache.org.
Regenerate charmonizer.c
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/27c95151
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/27c95151
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/27c95151
Branch: refs/heads/master
Commit: 27c95151888fbaa5bd47c0e9ea8f2bac45fd1c3a
Parents: 9844674
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 4 18:18:33 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 4 19:03:19 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/common/charmonizer.c | 6 ++++--
clownfish/runtime/common/charmonizer.c | 6 ++++--
common/charmonizer.c | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/27c95151/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index c76bf71..4bb9d67 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -1328,7 +1328,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
@@ -1784,7 +1786,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/27c95151/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index f239ff1..4651ef7 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -1607,7 +1607,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
@@ -2063,7 +2065,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/27c95151/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 04d5e0d..2acbf3d 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -1607,7 +1607,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
@@ -2063,7 +2065,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {
[lucy-commits] [2/4] git commit: refs/heads/master - Don't use -fPIC on Windows
Posted by nw...@apache.org.
Don't use -fPIC on Windows
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/9844674b
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/9844674b
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/9844674b
Branch: refs/heads/master
Commit: 9844674b31803953ca60c1bde4d6420f417b6841
Parents: c8ebd58
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 4 18:21:07 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 4 19:03:19 2013 +0200
----------------------------------------------------------------------
charmonizer/src/Charmonizer/Core/CFlags.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/9844674b/charmonizer/src/Charmonizer/Core/CFlags.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Core/CFlags.c b/charmonizer/src/Charmonizer/Core/CFlags.c
index ffd5b9a..1651925 100644
--- a/charmonizer/src/Charmonizer/Core/CFlags.c
+++ b/charmonizer/src/Charmonizer/Core/CFlags.c
@@ -184,7 +184,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
[lucy-commits] [4/4] git commit: refs/heads/master - Add FIXME comment for alloca
probe under MinGW
Posted by nw...@apache.org.
Add FIXME comment for alloca probe under MinGW
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/271bd85d
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/271bd85d
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/271bd85d
Branch: refs/heads/master
Commit: 271bd85dd3dc09f3ccbcdce58164ea010be04c8f
Parents: 27c9515
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 4 19:16:25 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 4 19:16:25 2013 +0200
----------------------------------------------------------------------
charmonizer/src/Charmonizer/Probe/Memory.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/271bd85d/charmonizer/src/Charmonizer/Probe/Memory.c
----------------------------------------------------------------------
diff --git a/charmonizer/src/Charmonizer/Probe/Memory.c b/charmonizer/src/Charmonizer/Probe/Memory.c
index 0d552f6..947f212 100644
--- a/charmonizer/src/Charmonizer/Probe/Memory.c
+++ b/charmonizer/src/Charmonizer/Probe/Memory.c
@@ -77,6 +77,11 @@ chaz_Memory_probe_alloca(void) {
chaz_ConfWriter_add_def("alloca", "alloca");
}
if (!has_alloca) {
+ /*
+ * FIXME: Under MinGW, alloca is defined in malloc.h. This probe
+ * produces compiler warnings but works regardless. These warnings
+ * are subsequently repeated during the build.
+ */
sprintf(code_buf, alloca_code, "stdlib.h", "alloca");
if (chaz_CC_test_compile(code_buf)) {
has_alloca = true;