diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-02-02 05:06:25 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2016-02-29 12:42:17 (GMT) |
| commit | 2c69e7a2c989043477e6a9513daedf2a119a4974 (patch) | |
| tree | 2c32589b1ee9950aeb15165e0d27773d339d2cf7 | |
| parent | 459eba11f730c9c8b1a0be622af29aa145f1b160 (diff) | |
| download | mxe-2c69e7a2c989043477e6a9513daedf2a119a4974.zip mxe-2c69e7a2c989043477e6a9513daedf2a119a4974.tar.gz mxe-2c69e7a2c989043477e6a9513daedf2a119a4974.tar.bz2 | |
aspell: disable dlopen
| -rw-r--r-- | src/aspell-1-fixes.patch | 53 | ||||
| -rw-r--r-- | src/aspell.mk | 5 |
2 files changed, 56 insertions, 2 deletions
diff --git a/src/aspell-1-fixes.patch b/src/aspell-1-fixes.patch index 3f29c50..3ff19e1 100644 --- a/src/aspell-1-fixes.patch +++ b/src/aspell-1-fixes.patch @@ -580,3 +580,56 @@ index 1111111..2222222 100644 # include <langinfo.h> #endif + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Tue, 2 Feb 2016 15:46:07 +1100 +Subject: [PATCH] add dlopen option + + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,6 +58,9 @@ AC_ARG_ENABLE(curses, + AC_ARG_ENABLE(curses-include, + [ --enable-curses-include=DIR]) + ++AC_ARG_ENABLE(dlopen, ++ [ --enable-dlopen]) ++ + AC_ARG_ENABLE(wide-curses, + AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control])) + +@@ -95,14 +98,17 @@ AC_LANG([C++]) + AM_PROG_CC_C_O + + AC_DISABLE_STATIC +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL + ++if test "$enable_dlopen" = "yes" ++then + dnl DL stuff ++AC_LIBTOOL_DLOPEN + + AC_CHECK_HEADERS(dlfcn.h,,[enable_compile_in_filters=yes]) + AC_CHECK_FUNC(dlopen,, + AC_CHECK_LIB(dl, dlopen,,[enable_compile_in_filters=yes])) ++fi + + dnl + +@@ -165,9 +171,12 @@ then + AC_DEFINE(ENABLE_WIN32_RELOCATABLE, 1, [Defined if win32 relocation should be used]) + fi + ++if test "$enable_dlopen" = "yes" ++then + # DL stuff + AC_CHECK_HEADERS(dlfcn.h) + AC_CHECK_LIB(dl, dlopen) ++fi + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + # # diff --git a/src/aspell.mk b/src/aspell.mk index c9af987..1abe843 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dlfcn-win32 gettext +$(PKG)_DEPS := gcc gettext define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/aspell/' | \ @@ -17,11 +17,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi + cd '$(1)' && $(LIBTOOLIZE) && autoreconf -fi cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --enable-win32-relocatable \ --disable-curses \ + --disable-dlopen \ --disable-pthreads \ CPPFLAGS='-DENABLE_W32_PREFIX=1' |