Kouhei Sutou
null+****@clear*****
Wed Aug 20 22:59:29 JST 2014
Kouhei Sutou 2014-08-20 22:59:29 +0900 (Wed, 20 Aug 2014) New Revision: 20680a0864b8fa8be50092cc2c1af246ba7e5e59 https://github.com/groonga/groonga/commit/20680a0864b8fa8be50092cc2c1af246ba7e5e59 Message: mrb: link Onigmo as static library I didn't know --with-pic configure option! We can create a static library that can be liked to shared libraries with --with-pic, --disable-shared and --enable-static configure options! Modified files: vendor/onigmo/Makefile.am vendor/onigmo/configure Modified: vendor/onigmo/Makefile.am (+0 -14) =================================================================== --- vendor/onigmo/Makefile.am 2014-08-20 22:53:09 +0900 (e23b84f) +++ vendor/onigmo/Makefile.am 2014-08-20 22:59:29 +0900 (40ccc1d) @@ -5,13 +5,9 @@ CONFIGURE_DEPENDENCIES = \ configure ALL_DEPEND_TARGETS = -INSTALL_DEPEND_TARGETS = -UNINSTALL_DEPEND_TARGETS = CLEAN_DEPEND_TARGETS = if WITH_MRUBY ALL_DEPEND_TARGETS += onigmo-all -INSTALL_DEPEND_TARGETS += onigmo-install -UNINSTALL_DEPEND_TARGETS += onigmo-uninstall CLEAN_DEPEND_TARGETS += onigmo-clean endif @@ -20,16 +16,6 @@ onigmo-all: all: $(ALL_DEPEND_TARGETS) -onigmo-install: - cd ../onigmo-source && $(MAKE) install - -install: $(INSTALL_DEPEND_TARGETS) - -onigmo-uninstall: - cd ../onigmo-source && $(MAKE) uninstall - -uninstall: $(UNINSTALL_DEPEND_TARGETS) - onigmo-clean: cd ../onigmo-source && $(MAKE) clean Modified: vendor/onigmo/configure (+2 -8) =================================================================== --- vendor/onigmo/configure 2014-08-20 22:53:09 +0900 (518c6b4) +++ vendor/onigmo/configure 2014-08-20 22:59:29 +0900 (88c71d1) @@ -5,21 +5,15 @@ set -u srcdir="." builddir="." -options="" +options="--with-pic --disable-shared --enable-static" for argument in "$@"; do case "$argument" in --srcdir=*) srcdir="$(echo "${argument}" | sed -e 's/--srcdir=//')" ;; - --prefix=*|--enable-shared*|--enable-static*) + --prefix=*) options="${options} ${argument}" ;; - --disable-shared) - options="${options} --enable-shared=no" - ;; - --disable-static) - options="${options} --enable-static=no" - ;; --enable-debug=*) options="${options} CFLAGS='-O0 -g3'" ;; -------------- next part -------------- HTML����������������������������...下载
