76 lines
3.1 KiB
Text
76 lines
3.1 KiB
Text
$NetBSD: patch-ac,v 1.9 2012/11/18 15:40:55 adam Exp $
|
|
|
|
--- configure.orig 2012-02-19 01:43:51.000000000 +0000
|
|
+++ configure
|
|
@@ -7349,7 +7349,6 @@ fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for -Werror=format-security" >&5
|
|
$as_echo_n "checking compiler support for -Werror=format-security... " >&6; }
|
|
ink_svd_CPPFLAGS="$CPPFLAGS"
|
|
- CPPFLAGS="-Werror=format-security $CPPFLAGS"
|
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
@@ -7450,7 +7449,7 @@ fi
|
|
|
|
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
|
|
|
|
-if test "x$GXX" = "xyes"; then
|
|
+if 0; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU compiler version" >&5
|
|
$as_echo_n "checking GNU compiler version... " >&6; }
|
|
|
|
@@ -7578,7 +7577,7 @@ cat >>confdefs.h <<_ACEOF
|
|
#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
|
|
_ACEOF
|
|
|
|
-ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi fr ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
|
|
+ALL_LINGUAS="am ar az be bg bn br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi ga gl he hr hu hy id it ja km ko lt mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
|
|
|
|
for ac_header in locale.h
|
|
do :
|
|
@@ -8445,11 +8444,11 @@ for ax_openmp_flag in $ax_openmp_flags;
|
|
#ifdef __cplusplus
|
|
extern "C"
|
|
#endif
|
|
-char omp_set_num_threads ();
|
|
+#include <omp.h>
|
|
int
|
|
main ()
|
|
{
|
|
-return omp_set_num_threads ();
|
|
+return omp_get_num_threads ();
|
|
;
|
|
return 0;
|
|
}
|
|
@@ -9620,11 +9619,11 @@ fi
|
|
|
|
|
|
if test "x$with_python" = "xyes"; then
|
|
- checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
|
|
+ checkPYTHON_CFLAGS=`${PYTHON} -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
|
|
if test "$?" -gt "0"; then
|
|
with_python="no"
|
|
else
|
|
- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
|
|
+ checkPYTHON_LIBS=`${PYTHON} -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
|
|
if test "$?" -gt "0"; then
|
|
with_python="no"
|
|
else
|
|
@@ -9684,7 +9683,7 @@ if test "x$enable_lcms" = "xno"; then
|
|
have_lcms2=no
|
|
else
|
|
# Have to test LittleCms presence
|
|
- if test "x${platform_osx}" != "xyes"; then
|
|
+ if test "x" != "xyes"; then
|
|
# lcms 2.2 & 2.3 have problems on OSX
|
|
|
|
pkg_failed=no
|
|
@@ -11095,7 +11094,7 @@ $as_echo "#define HAVE_CAIRO_PDF 1" >>co
|
|
|
|
fi
|
|
|
|
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl"
|
|
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2"
|
|
if test "x$openmp_ok" = "xyes"; then
|
|
INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
|
|
fi
|