* [gentoo-commits] gentoo-x86 commit in sci-geosciences/xtide/files: xtide-2.13.1-gps-switch.patch xtide-2.13.1-Werror.patch
@ 2013-07-13 11:29 Julian Ospald (hasufell)
0 siblings, 0 replies; only message in thread
From: Julian Ospald (hasufell) @ 2013-07-13 11:29 UTC (permalink / raw
To: gentoo-commits
hasufell 13/07/13 11:29:17
Added: xtide-2.13.1-gps-switch.patch
xtide-2.13.1-Werror.patch
Log:
version bump
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch?rev=1.1&content-type=text/plain
Index: xtide-2.13.1-gps-switch.patch
===================================================================
commit 755677baae16fd8772efd523a25b787ea3fc0772
Author: hasufell <hasufell@gentoo.org>
Date: Sat Jul 13 13:26:24 2013 +0200
BUILD: add --with-gps switch
We don't want automagic gps detection, but give control
to the user.
diff --git a/configure.ac b/configure.ac
index 86c7569..307def4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,12 @@ if test -z "${SKIP_COMPLICATED}"; then
fi
CXXFLAGS="${SAVED_CXXFLAGS}"
+AC_ARG_WITH([gps],
+ [AS_HELP_STRING([--with-gps],
+ [use libgpsd (default: no)])],
+ [gps=$withval],
+ [gps=no])
+
# xttpd configs
AC_ARG_WITH([xttpd-user],
[AS_HELP_STRING([--with-xttpd-user=user],
@@ -381,32 +387,35 @@ AC_CHECK_HEADER([Dstr], [AC_CHECK_LIB([dstr], [DstrCompat20070215Check])])
AM_CONDITIONAL(NO_LIBDSTR, test "$ac_cv_lib_dstr_DstrCompat20070215Check" != "yes")
# libgps is optional; use it if you have a compatible version.
-AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
- AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
- AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE([[
-#include <gps.h>
-#if (GPSD_API_MAJOR_VERSION < 5)
-#FAIL
-#endif
-int main (int argc, char **argv) {
- struct gps_data_t gpsdata;
- gps_open ("127.0.0.1", "2947", &gpsdata);
- gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
- gps_read (&gpsdata);
- return (gpsdata.fix.mode >= MODE_2D);
-}
- ]])],
- [
- AC_MSG_RESULT(yes)
- AC_DEFINE([GPS_GOOD])
- AC_SUBST([GPSD_LIBS], ["-lgps"])
- ],
- [
- AC_MSG_RESULT(no)
- ]
- )
-])])
+
+AS_IF([test "x$gps" = "xyes"], [
+ AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
+ AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE([[
+ #include <gps.h>
+ #if (GPSD_API_MAJOR_VERSION < 5)
+ #FAIL
+ #endif
+ int main (int argc, char **argv) {
+ struct gps_data_t gpsdata;
+ gps_open ("127.0.0.1", "2947", &gpsdata);
+ gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
+ gps_read (&gpsdata);
+ return (gpsdata.fix.mode >= MODE_2D);
+ }
+ ]])],
+ [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([GPS_GOOD])
+ AC_SUBST([GPSD_LIBS], ["-lgps"])
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ]
+ )
+ ], [AC_MSG_ERROR([cannot find libgps])])], [AC_MSG_ERROR([cannot find gps.h])])
+ ])
AC_TYPE_INT8_T
AC_TYPE_INT16_T
1.1 sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch?rev=1.1&content-type=text/plain
Index: xtide-2.13.1-Werror.patch
===================================================================
commit 9cf2369051fa887bd5f13bf7df80c51bcf040306
Author: hasufell <hasufell@gentoo.org>
Date: Sat Jul 13 13:25:42 2013 +0200
BUILD: remove -Werror
It's discouraged to add non-specific Werror flags.
diff --git a/configure.ac b/configure.ac
index b366337..86c7569 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_if(2.65, AC_AUTOCONF_VERSION, [m4_fatal([autoconf version 2.65 is broken and
# FIXME: Update version info on each release
AC_INIT([XTide], [2.13.1], [dave@flaterco.com])
-AM_INIT_AUTOMAKE([-Wall -Werror])
+AM_INIT_AUTOMAKE([-Wall])
AC_LANG([C++])
AC_PROG_CXX
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-07-13 11:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-13 11:29 [gentoo-commits] gentoo-x86 commit in sci-geosciences/xtide/files: xtide-2.13.1-gps-switch.patch xtide-2.13.1-Werror.patch Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox