Big oops! Bring back fcntl-o.m4 fix. It is packaged and in fact

picked up by other ports, e.g. audio/xmms.  touch(1) the file to
avoid triggering an autotools rebuild cascade.

Breakage noticed by landry@
This commit is contained in:
naddy 2010-10-26 14:15:01 +00:00
parent 72de11738d
commit 6ebce09c16
2 changed files with 26 additions and 1 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.52 2010/10/18 17:47:52 espie Exp $
# $OpenBSD: Makefile,v 1.53 2010/10/26 14:15:01 naddy Exp $
COMMENT= GNU gettext
DISTNAME= gettext-0.18.1
REVISION= 0
SHARED_LIBS += intl 5.0 # .9.1
SHARED_LIBS += asprintf 1.0 # .0.0
SHARED_LIBS += gettextlib 3.0 # .0.0
@ -44,6 +45,11 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
EXTRA_LOCALES= en he hr hu lv no
# avoid triggering autotools rebuild cascade
post-patch:
touch -r ${WRKSRC}/gettext-runtime/m4/fcntl-o.m4.orig \
${WRKSRC}/gettext-runtime/m4/fcntl-o.m4
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
@for f in start-po.el po-mode.el po-compat.el; do \

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-gettext-runtime_m4_fcntl-o_m4,v 1.3 2010/10/26 14:15:01 naddy Exp $
Provide fallback for AC_USE_SYSTEM_EXTENSIONS which was introduced
in autoconf 2.60. This is picked up by other ports that run autoconf,
e.g. audio/xmms.
--- gettext-runtime/m4/fcntl-o.m4.orig Thu Jul 1 07:44:09 2010
+++ gettext-runtime/m4/fcntl-o.m4 Thu Jul 1 07:44:43 2010
@@ -12,7 +12,9 @@ dnl Written by Paul Eggert.
AC_DEFUN([gl_FCNTL_O_FLAGS],
[
dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
- AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+ [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])],
+ [AC_REQUIRE([AC_GNU_SOURCE])])
AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM(