Kouhei Sutou
null+****@clear*****
Fri Sep 26 23:11:00 JST 2014
Kouhei Sutou 2014-09-26 23:11:00 +0900 (Fri, 26 Sep 2014) New Revision: 2e0029817a040524ad2424ce77e51a06585785f2 https://github.com/groonga/groonga/commit/2e0029817a040524ad2424ce77e51a06585785f2 Message: Revert "package windows: apply a patch that adds "-no-undefined" flag to Onigmo" This reverts commit 7e7e001bc779a95251c20ca42411fe305a777fe9. Because the patche is merged into upstream. Removed files: vendor/onigmo/patches/0001-Add-no-undefine-link-flag.patch Modified files: vendor/Makefile.am vendor/onigmo/Makefile.am Modified: vendor/Makefile.am (+0 -2) =================================================================== --- vendor/Makefile.am 2014-09-26 22:51:18 +0900 (46fdd14) +++ vendor/Makefile.am 2014-09-26 23:11:00 +0900 (334b6fd) @@ -16,5 +16,3 @@ 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 (+1 -2) =================================================================== --- vendor/onigmo/Makefile.am 2014-09-26 22:51:18 +0900 (03ef228) +++ vendor/onigmo/Makefile.am 2014-09-26 23:11:00 +0900 (40ccc1d) @@ -1,6 +1,5 @@ EXTRA_DIST = \ - configure \ - patches + configure CONFIGURE_DEPENDENCIES = \ configure Deleted: vendor/onigmo/patches/0001-Add-no-undefine-link-flag.patch (+0 -49) 100644 =================================================================== --- vendor/onigmo/patches/0001-Add-no-undefine-link-flag.patch 2014-09-26 22:51:18 +0900 (f780f4d) +++ /dev/null @@ -1,49 +0,0 @@ -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