rpms/gpsd/devel parallel-make-dependencies.patch,NONE,1.1
Douglas E. Warner
silfreed at fedoraproject.org
Wed Mar 25 13:00:35 UTC 2009
Author: silfreed
Update of /cvs/pkgs/rpms/gpsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19458
Added Files:
parallel-make-dependencies.patch
Log Message:
* Wed Mar 25 2009 Douglas E. Warner <silfreed at silfreed.net> - 2.39-2
- adding patch to try to fix parallel make errors
parallel-make-dependencies.patch:
--- NEW FILE parallel-make-dependencies.patch ---
diff -ruN gpsd-2.39-orig/aclocal.m4 gpsd-2.39/aclocal.m4
--- gpsd-2.39-orig/aclocal.m4 2009-03-18 17:10:27.000000000 -0400
+++ gpsd-2.39/aclocal.m4 2009-03-25 08:57:38.000000000 -0400
@@ -13,194 +13,108 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(AC_AUTOCONF_VERSION, [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-# serial 56 LT_INIT
+# serial 52 AC_PROG_LIBTOOL
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
- [m4_default([$3],
- [m4_fatal([Libtool version $1 or higher is required],
- 63)])],
- [$2])])
-
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [m4_define([AC_PROVIDE_IFELSE],
+ [m4_ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
- *\ * | *\ *)
- AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [AC_LIBTOOL_CXX],
+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+ ])])
+dnl And a similar setup for Fortran 77 support
+ AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [AC_LIBTOOL_F77],
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [ifdef([AC_PROG_GCJ],
+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([A][M_PROG_GCJ],
+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([LT_AC_PROG_GCJ],
+ [define([LT_AC_PROG_GCJ],
+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
+# Prevent multiple expansion
[...54719 lines suppressed...]
+ while test -d "$$WITNESS.lock"; do sleep 1; done; \
+ test -f "$$WITNESS"; \
+ fi; \
+ fi
#SUBDIRS = contrib
@@ -22,19 +39,22 @@
INCLUDES = $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1
endif
+RTCM104PAGES_DIST = gpsdecode.1
if HAVE_RTCM104V2
RTCM104PROGS = gpsdecode
-RTCM104PAGES = gpsdecode.1
+RTCM104PAGES = $(RTCM104PAGES_DIST)
endif
bin_PROGRAMS = $(MOTIF_PROGS) $(XAW_PROGS) $(RTCM104PROGS) $(CURSESPROGS) gpsctl gpspipe gpsflash gpxlogger lcdgps
sbin_PROGRAMS = gpsd
check_PROGRAMS = test_bits test_gpsmm test_packet test_mkgmtime test_geoid
+
+PYTHONPAGES_DIST = gpsprof.1 gpsfake.1 gpscat.1
if HAVE_PYTHON
dist_bin_SCRIPTS = gpsprof gpsfake gpscat
python_PYTHON = gps.py gpsfake.py gpscap.py
nodist_python_PYTHON = gpspacket.so gpslib.so
-PYTHONPAGES = gpsprof.1 gpsfake.1 gpscat.1
+PYTHONPAGES = $(PYTHONPAGES_DIST)
endif
#
@@ -187,8 +207,24 @@
PYEXTENSIONS = gpspacket.so gpslib.so
noinst_SCRIPTS = gpspacket.so gpslib.so setup.py
-gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
- (pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
+# Multiple-outputs hack. See
+# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
+$(PYEXTENSIONS): stamp-python-modules
+ + at WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED)
+# TODO: Should the dependency on libgps.la be enforced inside
+# setup.py? (See the variable 'needed_files' in setup.py.)
+stamp-python-modules: gpspacket.c gpslib.c libgps.la setup.py
+ @rm -f '$@' '$@.tmp'
+ @echo 'timestamp for $@' > '$@.tmp'
+ cd '$(srcdir)' && \
+ env abs_builddir='$(abs_builddir)' \
+ MAKE='$(MAKE)' \
+ $(PYTHON) setup.py build_ext \
+ --build-lib '$(abs_builddir)' \
+ --build-temp '$(abs_builddir)/build' \
+ --include-dirs '$(abs_builddir):.'
+ @mv -f '$@.tmp' '$@'
+CLEANFILES += stamp-python-modules stamp-python-modules.tmp
endif
# Clean up after Python
clean-local:
@@ -224,31 +260,39 @@
test_mkgmtime_SOURCES = test_mkgmtime.c
test_mkgmtime_LDADD = $(LIBC) libgps.la -lm
-if HAVE_XSLT_PROCESSOR
-#
-# Create Manpages
-#
-BUILT_MANPAGES = \
+MANPAGES_BASE = \
gpsd.8 \
gps.1 \
xgps.1 \
xgpsspeed.1 \
cgps.1 \
+ lcdgps.1 \
cgpxlogger.1 \
libgps.3 \
libgpsmm.3 \
libgpsd.3 \
gpsmon.1 \
- $(RTCM104PAGES) \
- $(PYTHONPAGES) \
gpsctl.1 \
gpspipe.1 \
gpsflash.1 \
rtcm-104.5 \
srec.5
+MANPAGES_DIST = \
+ $(MANPAGES_BASE) \
+ $(RTCM104PAGES_DIST) \
+ $(PYTHONPAGES_DIST)
+
man_MANS = \
- $(BUILT_MANPAGES)
+ $(MANPAGES_BASE) \
+ $(RTCM104PAGES) \
+ $(PYTHONPAGES)
+
+if HAVE_XSLT_PROCESSOR
+#
+# Create Manpages
+#
+BUILT_MANPAGES = $(MANPAGES_DIST)
.xml.1:
$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
@@ -262,36 +306,15 @@
.xml.8:
$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
-gpsd.8: gpsd.xml
-
-gps.1 xgps.1 xgpsspeed.1 cgps.1 cgpxlogger.1: gps.xml
-
-libgps.3: libgps.xml
-
-libgpsmm.3: libgpsmm.xml
-
-libgpsd.3: libgpsd.xml
-
-gpsctl.1: gpsctl.xml
-
-gpscat.1: gpsctl.xml
-
-gpsprof.1: gpsprof.xml
-
-gpsfake.1: gpsfake.xml
-
-gpsmon.1: gpsmon.xml
-
-gpspipe.1: gpspipe.xml
-
-gpsdecode.1: gpsdecode.xml
-
-rtcm-104.5: rtcm-104.xml
-
-srec.5: srec.xml
-
-gpsflash.1: gpsflash.xml
-
+# Another instance of the multiple-outputs hack.
+gps.1 xgps.1 xgpsspeed.1 cgps.1 lcdgps.1 cgpxlogger.1: stamp-gps-manpages
+ + at WITNESS=stamp-gps-manpages; $(MULTIOUT_RECOVER_DELETED)
+stamp-gps-manpages: gps.xml
+ @rm -f '$@' '$@.tmp'
+ @echo 'timestamp for $@' > '$@.tmp'
+ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) '$(srcdir)/gps.xml'
+ @mv -f '$@.tmp' '$@'
+CLEANFILES += stamp-gps-manpages stamp-gps-manpages.tmp
endif
noinst_HEADERS = driver_italk.h driver_rtcm2.h driver_superstar2.h \
@@ -320,6 +343,7 @@
libgpsmm.xml \
gpsprof.xml \
gpsfake.xml \
+ gpscat.xml \
gpsctl.xml \
gpsmon.xml \
gpspipe.xml \
@@ -327,7 +351,7 @@
rtcm-104.xml \
srec.xml \
gpsflash.xml \
- $(man_MANS) \
+ $(MANPAGES_DIST) \
xgps.ad \
xgpsspeed.ad \
gpsd.rules \
@@ -346,10 +370,17 @@
libgps.pc.in \
libgpsd.pc.in \
gpscap.ini \
- contrib/* \
- packaging/*
+ packaging/etc_default_gpsd \
+ packaging/etc_init.d_gpsd \
+ packaging/etc_init.d_gpsd_rpm
+
+dist-hook:
+ $(MKDIR_P) '$(distdir)/contrib' && \
+ cp -p '$(srcdir)/contrib/'* '$(distdir)/contrib'
+distclean-local:
+ rm -rf '$(distdir)/contrib'
-CLEANFILES = $(BUILT_SOURCES) test_float *.core $(PYEXTENSIONS) $(BUILT_MANPAGES)
+CLEANFILES += $(BUILT_SOURCES) test_float *.core $(PYEXTENSIONS) $(BUILT_MANPAGES)
pkgconfig_DATA = libgps.pc libgpsd.pc
pkgconfigdir = $(libdir)/pkgconfig
@@ -491,7 +522,7 @@
# Regression test the unpacking code in libgps
unpack-regress: libgps
- @echo "Testing the clent sentence unpacker..."
+ @echo "Testing the client-library sentence decoder..."
@$(srcdir)/libgps -u >test/test.chk
@diff -u test/unpack.chk test/test.chk
More information about the fedora-extras-commits
mailing list