summaryrefslogtreecommitdiffstats
path: root/cygwin-gettext.spec
diff options
context:
space:
mode:
Diffstat (limited to 'cygwin-gettext.spec')
-rw-r--r--cygwin-gettext.spec50
1 files changed, 43 insertions, 7 deletions
diff --git a/cygwin-gettext.spec b/cygwin-gettext.spec
index 38c64e8..d183c56 100644
--- a/cygwin-gettext.spec
+++ b/cygwin-gettext.spec
@@ -6,17 +6,21 @@
%define __debug_install_post %{_cygwin_debug_install_post}
Name: cygwin-gettext
-Version: 0.17
-Release: 2
+Version: 0.18.1.1
+Release: 1
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
Group: Development/Libraries
URL: http://www.gnu.org/software/gettext/
-Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
+Patch0: gettext-0.18.1.1-autopoint-V.patch
+Patch1: gettext-0.18.1.1-locale.patch
+Patch2: gettext-0.18.1.1-reloc.patch
+
BuildRequires: cygwin-filesystem
BuildRequires: cygwin
BuildRequires: cygwin-gcc
@@ -49,6 +53,9 @@ Static version of the Cygwin Gettext library.
%prep
%setup -q -n gettext-%{version}
+%patch0 -p2
+%patch1 -p2
+%patch2 -p2
rm -f m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4
touch m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4
@@ -57,15 +64,40 @@ libtoolize --copy --force
%build
+# gnulib uses many AC_TRY_RUN/AC_RUN_IFELSE tests, but assumes functions
+# are broken when cross-compiling and tries replacing them, eventually leading
+# to compile errors in gettext-tools. The correct values below are based on
+# comparison with a Cygwin-native build.
%{_cygwin_configure} \
- gl_cv_cc_visibility=no \
--disable-java \
--disable-native-java \
--disable-csharp \
- --disable-openmp \
--enable-static --enable-shared \
- --enable-threads=win32 \
- --without-emacs
+ --enable-threads=posix \
+ --without-emacs \
+ --with-included-glib \
+ --with-included-libcroco \
+ --with-included-libunistring \
+ --with-included-libxml \
+ gl_cv_cc_visibility=no \
+ gl_cv_func_btowc_eof=yes gl_cv_func_btowc_nul=yes \
+ gl_cv_func_dup2_works=yes \
+ gl_cv_func_fcntl_f_dupfd_works=yes \
+ gl_cv_func_working_getdelim=yes \
+ gl_cv_func_gettimeofday_clobber=no \
+ ac_cv_func_lstat_dereferences_slashed_symlink=yes \
+ gl_cv_func_memchr_works=yes \
+ gl_cv_func_svid_putenv=yes \
+ gl_cv_func_readlink_works=yes \
+ gl_cv_func_rmdir_works=yes \
+ gl_cv_func_setenv_works=yes gl_cv_func_unsetenv_works=yes \
+ gl_cv_func_stat_file_slash=yes \
+ gl_cv_func_stpncpy=yes \
+ gl_cv_func_strstr_linear=yes \
+ gl_cv_func_symlink_works=yes \
+ gl_cv_func_wctob_works=yes \
+ gl_cv_func_wcwidth_works=yes
+
make %{?_smp_mflags}
@@ -126,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 31 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.18.1.1-1
+- Version bump.
+- Included relocation and locale patches from Cygwin gettext 0.18.1.1-2.
+
* Sun Aug 21 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 0.17-2
- Remove Cygwin EXEs and other files not needed for cross-compiling.