diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-22 18:52:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-22 18:52:00 +0000 |
| commit | f025f43fc4140349a95ace94617a8be52c10d395 (patch) | |
| tree | 4984ae5d112ebb28c363b13efd5fba59fcd15451 /math/qalculate/patches/patch-ad | |
| parent | 36c6544bbafc585d7f24f83810c8a335debb5be6 (diff) | |
| download | pkgsrc-f025f43fc4140349a95ace94617a8be52c10d395.tar.gz | |
Reorder the linker tests in the configure script so that we test for
C libraries *before* we throw the AC_LANG([C++]) switch. This makes
the generated configure script use the C compiler/linker instead of
the C++ compiler/linker when running tests. This avoids errors like
these based on not correctly getting the function signature correct:
conftest.cc:36: error: nonnull argument with out-of-range operand
number (arg 1, operand 2)
This error was causing the configure script to not detect *gettext()
routines and not building and installing the *.mo files. This fixes
the error noted in the bulk build results:
http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html
Diffstat (limited to 'math/qalculate/patches/patch-ad')
| -rw-r--r-- | math/qalculate/patches/patch-ad | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/math/qalculate/patches/patch-ad b/math/qalculate/patches/patch-ad new file mode 100644 index 00000000000..931b6a7fb0a --- /dev/null +++ b/math/qalculate/patches/patch-ad @@ -0,0 +1,62 @@ +$NetBSD: patch-ad,v 1.1 2006/06/22 18:52:00 jlam Exp $ + +--- configure.in.orig 2006-04-13 06:24:58.000000000 -0400 ++++ configure.in +@@ -84,28 +84,6 @@ AC_SUBST(QALCULATE_AGE) + + + dnl -------------------------------- +-dnl | check for neccessary libraries |----------------------------------------- +-dnl -------------------------------- +- +-AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"]) +- +-AC_LANG([C++]) +- +-AC_PATH_CLN(1.1.0, [ +- LIBS="$LIBS $CLN_LIBS" +- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" +- AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used]) +-], AC_MSG_ERROR([No suitable installed version of CLN could be found.])) +- +- +-PKG_CHECK_MODULES(GLIB, [ +- glib-2.0 +- libxml-2.0 >= 2.3.8 +- ]) +-AC_SUBST(GLIB_CFLAGS) +-AC_SUBST(GLIB_LIBS) +- +-dnl -------------------------------- + dnl | check for readline |----------------------------------------- + dnl -------------------------------- + +@@ -230,6 +208,28 @@ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, " + INTLTOOL_QALCULATE_DEFINITIONS_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-defs/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-defs/.intltool-merge-cache $(top_srcdir)/po-defs $< [$]@' + AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE) + ++dnl -------------------------------- ++dnl | check for neccessary libraries |----------------------------------------- ++dnl -------------------------------- ++ ++AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"]) ++ ++AC_LANG([C++]) ++ ++AC_PATH_CLN(1.1.0, [ ++ LIBS="$LIBS $CLN_LIBS" ++ CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS" ++ AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used]) ++], AC_MSG_ERROR([No suitable installed version of CLN could be found.])) ++ ++ ++PKG_CHECK_MODULES(GLIB, [ ++ glib-2.0 ++ libxml-2.0 >= 2.3.8 ++ ]) ++AC_SUBST(GLIB_CFLAGS) ++AC_SUBST(GLIB_LIBS) ++ + dnl -------- + dnl | output |----------------------------------------------------------------- + dnl -------- |