diff options
Diffstat (limited to 'package/valgrind/patches/patch-mpi_Makefile_in')
| -rw-r--r-- | package/valgrind/patches/patch-mpi_Makefile_in | 216 |
1 files changed, 0 insertions, 216 deletions
diff --git a/package/valgrind/patches/patch-mpi_Makefile_in b/package/valgrind/patches/patch-mpi_Makefile_in deleted file mode 100644 index 8b2e804b5..000000000 --- a/package/valgrind/patches/patch-mpi_Makefile_in +++ /dev/null @@ -1,216 +0,0 @@ ---- valgrind-3.7.0.orig/mpi/Makefile.in 2011-11-05 12:26:53.000000000 +0100 -+++ valgrind-3.7.0/mpi/Makefile.in 2013-07-23 12:27:53.000000000 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# Makefile.in generated by automake 1.10.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -24,9 +24,8 @@ - - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ --pkglibexecdir = $(libexecdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c -@@ -54,7 +53,6 @@ am__configure_deps = $(am__aclocal_m4_de - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = --CONFIG_CLEAN_VPATH_FILES = - @BUILD_MPIWRAP_PRI_TRUE@am__EXEEXT_1 = libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so$(EXEEXT) - @BUILD_MPIWRAP_SEC_TRUE@am__EXEEXT_2 = libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so$(EXEEXT) - PROGRAMS = $(noinst_PROGRAMS) -@@ -82,7 +80,6 @@ libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@ - $(LDFLAGS) -o $@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles --am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) -@@ -181,6 +178,7 @@ VERSION = @VERSION@ - VGCONF_ARCH_PRI = @VGCONF_ARCH_PRI@ - VGCONF_ARCH_SEC = @VGCONF_ARCH_SEC@ - VGCONF_OS = @VGCONF_OS@ -+VGCONF_PLATFORM_ARM_ARCH = @VGCONF_PLATFORM_ARM_ARCH@ - VGCONF_PLATFORM_PRI_CAPS = @VGCONF_PLATFORM_PRI_CAPS@ - VGCONF_PLATFORM_SEC_CAPS = @VGCONF_PLATFORM_SEC_CAPS@ - VGCONF_PLATVARIANT = @VGCONF_PLATVARIANT@ -@@ -318,10 +316,10 @@ AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_ - AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g - AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ - AM_CFLAGS_ARM_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ -- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8 -+ $(AM_CFLAGS_BASE) @VGCONF_PLATFORM_ARM_ARCH@ - - AM_CCASFLAGS_ARM_LINUX = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \ -- -marm -mcpu=cortex-a8 -g -+ @VGCONF_PLATFORM_ARM_ARCH@ -g - - AM_FLAG_M3264_X86_DARWIN = -arch i386 - AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \ -@@ -401,9 +399,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mpi/Makefile'; \ -- $(am__cd) $(top_srcdir) && \ -- $(AUTOMAKE) --foreign mpi/Makefile -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mpi/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign mpi/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -421,7 +419,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(am__aclocal_m4_deps): - - clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -@@ -443,42 +440,42 @@ distclean-compile: - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.o: libmpiwrap.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -MT libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.o -MD -MP -MF $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Tpo -c -o libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.o `test -f 'libmpiwrap.c' || echo '$(srcdir)/'`libmpiwrap.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Po -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpiwrap.c' object='libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -c -o libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.o `test -f 'libmpiwrap.c' || echo '$(srcdir)/'`libmpiwrap.c - - libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.obj: libmpiwrap.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -MT libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.obj -MD -MP -MF $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Tpo -c -o libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.obj `if test -f 'libmpiwrap.c'; then $(CYGPATH_W) 'libmpiwrap.c'; else $(CYGPATH_W) '$(srcdir)/libmpiwrap.c'; fi` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Po -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpiwrap.c' object='libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -c -o libmpiwrap_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so-libmpiwrap.obj `if test -f 'libmpiwrap.c'; then $(CYGPATH_W) 'libmpiwrap.c'; else $(CYGPATH_W) '$(srcdir)/libmpiwrap.c'; fi` - - libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.o: libmpiwrap.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -MT libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.o -MD -MP -MF $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Tpo -c -o libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.o `test -f 'libmpiwrap.c' || echo '$(srcdir)/'`libmpiwrap.c --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Po -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpiwrap.c' object='libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -c -o libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.o `test -f 'libmpiwrap.c' || echo '$(srcdir)/'`libmpiwrap.c - - libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.obj: libmpiwrap.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -MT libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.obj -MD -MP -MF $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Tpo -c -o libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.obj `if test -f 'libmpiwrap.c'; then $(CYGPATH_W) 'libmpiwrap.c'; else $(CYGPATH_W) '$(srcdir)/libmpiwrap.c'; fi` --@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Po -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Tpo $(DEPDIR)/libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libmpiwrap.c' object='libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS) $(CPPFLAGS) $(libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS) $(CFLAGS) -c -o libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so-libmpiwrap.obj `if test -f 'libmpiwrap.c'; then $(CYGPATH_W) 'libmpiwrap.c'; else $(CYGPATH_W) '$(srcdir)/libmpiwrap.c'; fi` -@@ -495,7 +492,7 @@ tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -- set x; \ -+ tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -503,34 +500,29 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ -- shift; \ -- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -- if test $$# -gt 0; then \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- "$$@" $$unique; \ -- else \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$unique; \ -- fi; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ - fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -+ tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ -- test -z "$(CTAGS_ARGS)$$unique" \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$unique -+ $$tags $$unique - - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ -- && $(am__cd) $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) "$$here" -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -@@ -551,17 +543,13 @@ distdir: $(DISTFILES) - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test -d "$(distdir)/$$file"; then \ -- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -- fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ -- test -f "$(distdir)/$$file" \ -- || cp -p $$d/$$file "$(distdir)/$$file" \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -@@ -589,7 +577,6 @@ clean-generic: - - distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -754,7 +741,6 @@ all-local: inplace-noinst_PROGRAMS inpla - clean-local: clean-noinst_DSYMS - - install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: |