You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

98 lines
2.5 KiB

Index: configure
--- configure.orig 2017-02-08 05:48:44.000000000 +0100
+++ configure 2017-02-08 20:26:56.567795000 +0100
@@ -4647,9 +4647,9 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+ CFLAGS="-O2"
else
- CFLAGS="-g"
+ CFLAGS=""
fi
else
if test "$GCC" = yes; then
@@ -5803,9 +5803,9 @@
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
+ CXXFLAGS="-O2"
else
- CXXFLAGS="-g"
+ CXXFLAGS=""
fi
else
if test "$GXX" = yes; then
@@ -6380,9 +6380,9 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+ CFLAGS="-O2"
else
- CFLAGS="-g"
+ CFLAGS=""
fi
else
if test "$GCC" = yes; then
@@ -6997,7 +6997,7 @@
NO_STRICT_ALIASING_CFLAGS=""
NO_FLOAT_EQUAL_CFLAGS=""
NO_BAD_FUNCTION_CAST_CFLAGS=""
-if test "$GCC" = "yes"; then
+if false; then
Index: src/Makefile.in
--- src/Makefile.in.orig 2017-02-08 05:48:48.000000000 +0100
+++ src/Makefile.in 2017-02-08 20:33:37.521450000 +0100
@@ -553,8 +553,9 @@
nodist_EXTRA_groonga_SOURCES = $(NONEXISTENT_CXX_SOURCE)
groonga_CFLAGS = $(AM_CFLAGS) $(LIBEDIT_CFLAGS)
-groonga_LDADD = \
+groonga_LDADD = -static \
$(top_builddir)/lib/libgroonga.la \
+ $(top_builddir)/vendor/onigmo-source/libonigmo.la \
$(LIBEDIT_LIBS) \
$(MESSAGE_PACK_LIBS)
@@ -562,16 +563,18 @@
grnslap.c
nodist_EXTRA_grnslap_SOURCES = $(NONEXISTENT_CXX_SOURCE)
-grnslap_LDADD = \
+grnslap_LDADD = -static \
$(top_builddir)/lib/libgroonga.la \
+ $(top_builddir)/vendor/onigmo-source/libonigmo.la \
$(MESSAGE_PACK_LIBS)
groonga_benchmark_SOURCES = \
groonga_benchmark.c
nodist_EXTRA_groonga_benchmark_SOURCES = $(NONEXISTENT_CXX_SOURCE)
-groonga_benchmark_LDADD = \
+groonga_benchmark_LDADD = -static \
$(top_builddir)/lib/libgroonga.la \
+ $(top_builddir)/vendor/onigmo-source/libonigmo.la \
$(MESSAGE_PACK_LIBS)
grndb_SOURCES = \
Index: src/suggest/Makefile.in
--- src/suggest/Makefile.in.orig 2017-02-08 05:48:48.000000000 +0100
+++ src/suggest/Makefile.in 2017-02-08 20:33:28.410190000 +0100
@@ -554,8 +554,9 @@
groonga_suggest_create_dataset_CFLAGS = \
$(AM_CFLAGS)
-groonga_suggest_create_dataset_LDADD = \
- $(top_builddir)/lib/libgroonga.la
+groonga_suggest_create_dataset_LDADD = -static \
+ $(top_builddir)/lib/libgroonga.la \
+ $(top_builddir)/vendor/onigmo-source/libonigmo.la
libutil_la_SOURCES = \
util.c \