Kouhei Sutou
null+****@clear*****
Fri Sep 26 22:49:36 JST 2014
Kouhei Sutou 2014-09-26 22:49:36 +0900 (Fri, 26 Sep 2014) New Revision: 7e7e001bc779a95251c20ca42411fe305a777fe9 https://github.com/groonga/groonga/commit/7e7e001bc779a95251c20ca42411fe305a777fe9 Message: package windows: apply a patch that adds "-no-undefined" flag to Onigmo Added files: vendor/onigmo/patches/0001-Add-no-undefine-link-flag.patch Modified files: vendor/Makefile.am vendor/onigmo/Makefile.am Modified: vendor/Makefile.am (+2 -0) =================================================================== --- vendor/Makefile.am 2014-09-26 22:48:42 +0900 (334b6fd) +++ vendor/Makefile.am 2014-09-26 22:49:36 +0900 (46fdd14) @@ -16,3 +16,5 @@ dist-hook: $(MKDIR_P) $(distdir)/onigmo-source GIT_DIR=$(srcdir)/onigmo-source/.git git archive --format=tar HEAD | \ tar xf - -C $(distdir)/onigmo-source + cat $(srcdir)/onigmo/patches/0001-Add-no-undefine-link-flag.patch | \ + (cd $(distdir)/onigmo-source; patch -p1) Modified: vendor/onigmo/Makefile.am (+2 -1) =================================================================== --- vendor/onigmo/Makefile.am 2014-09-26 22:48:42 +0900 (40ccc1d) +++ vendor/onigmo/Makefile.am 2014-09-26 22:49:36 +0900 (03ef228) @@ -1,5 +1,6 @@ EXTRA_DIST = \ - configure + configure \ + patches CONFIGURE_DEPENDENCIES = \ configure Added: vendor/onigmo/patches/0001-Add-no-undefine-link-flag.patch (+49 -0) 100644 =================================================================== --- /dev/null +++ vendor/onigmo/patches/0001-Add-no-undefine-link-flag.patch 2014-09-26 22:49:36 +0900 (f780f4d) @@ -0,0 +1,49 @@ +From 62a59a1c02e4ed24e0c892802fd5e37c19d94a28 Mon Sep 17 00:00:00 2001 +From: Kouhei Sutou <kou �� clear-code.com> +Date: Fri, 26 Sep 2014 22:00:01 +0900 +Subject: [PATCH] Add -no-undefine link flag + +It is needed to build DLL with libtool. I tested it by cross-compiling +on Debian GNU/Linux sid with x86_64-w64-mingw32-gcc. + +GCC version: + + % x86_64-w64-mingw32-gcc --version + x86_64-w64-mingw32-gcc (GCC) 4.9.1 + Copyright (C) 2014 Free Software Foundation, Inc. + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 1cf7411..07cf35f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ libonig_la_SOURCES = regint.h regparse.h regenc.h st.h \ + $(encdir)/euc_tw.c $(encdir)/euc_kr.c $(encdir)/big5.c \ + $(encdir)/gb18030.c $(encdir)/koi8_r.c $(encdir)/cp1251.c + +-libonig_la_LDFLAGS = -version-info $(LTVERSION) ++libonig_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined + + EXTRA_DIST = .gitignore oniguruma.pc.in HISTORY README.ja index.html \ + index_ja.html doc/API doc/API.ja doc/RE doc/RE.ja doc/FAQ doc/FAQ.ja \ +diff --git a/Makefile.in b/Makefile.in +index aa545fb..5849df9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -340,7 +340,7 @@ libonig_la_SOURCES = regint.h regparse.h regenc.h st.h \ + $(encdir)/euc_tw.c $(encdir)/euc_kr.c $(encdir)/big5.c \ + $(encdir)/gb18030.c $(encdir)/koi8_r.c $(encdir)/cp1251.c + +-libonig_la_LDFLAGS = -version-info $(LTVERSION) ++libonig_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined + EXTRA_DIST = .gitignore oniguruma.pc.in HISTORY README.ja index.html \ + index_ja.html doc/API doc/API.ja doc/RE doc/RE.ja doc/FAQ doc/FAQ.ja \ + doc/UnicodeProps.txt \ +-- +2.1.0 + -------------- next part -------------- HTML����������������������������...Download
