- remove XXX from Makefile and apply patch provided by upstream

This commit is contained in:
jasper 2012-10-21 15:22:05 +00:00
parent 5054a126ee
commit 05c2f6aada
2 changed files with 24 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.74 2012/10/21 14:40:34 jasper Exp $
# $OpenBSD: Makefile,v 1.75 2012/10/21 15:22:05 jasper Exp $
SHARED_ONLY= Yes
@ -74,10 +74,8 @@ YACC= bison -y
CONFIGURE_ARGS+= --disable-static \
--enable-plugin-subversion \
--with-symbol-db-shm=/tmp
# XXX: https://bugzilla.gnome.org/show_bug.cgi?id=686578
CONFIGURE_ENV+= ac_ct_CXX=/usr/bin/c++
# XXX: needed because of patch-m4_intltool_m4
# XXX: needed because of patch-m4_intltool_m4 (and patch-configure_ac)
AUTOCONF_VERSION= 2.68
CONFIGURE_STYLE= autoconf

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-configure_ac,v 1.8 2012/10/21 15:22:05 jasper Exp $
From ed542779a5d35c3cdef3567a9c1aaaf8cfa23b19 Mon Sep 17 00:00:00 2001
From: Sébastien Granjoux <seb.sfo@free.fr>
Date: Sat, 13 Oct 2012 20:35:09 +0000
Subject: build: bgo#684758 - anjuta-3.5.91 fails to configure due to ac_ct_CXX check
--- configure.ac.orig Sun Oct 21 17:18:52 2012
+++ configure.ac Sun Oct 21 17:19:54 2012
@@ -80,10 +80,8 @@ fi
AC_LANG([C])
AC_LANG([C++])
AC_PROG_CXX
-if test "x$ac_ct_CXX" = "x"
-then
- AC_MSG_ERROR([C++ Compiler required to compile Anjuta])
-fi
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],,
+ AC_MSG_ERROR([C++ Compiler required to compile Anjuta]))
AM_PROG_CC_C_O
GNOME_COMPILE_WARNINGS([maximum])