diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/maloc/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/maloc/files')
-rw-r--r-- | dev-libs/maloc/files/1.4-asneeded.patch | 17 | ||||
-rw-r--r-- | dev-libs/maloc/files/1.4-doc.patch | 21 | ||||
-rw-r--r-- | dev-libs/maloc/files/1.4-mpi.patch | 24 |
3 files changed, 0 insertions, 62 deletions
diff --git a/dev-libs/maloc/files/1.4-asneeded.patch b/dev-libs/maloc/files/1.4-asneeded.patch deleted file mode 100644 index aed7299e089a..000000000000 --- a/dev-libs/maloc/files/1.4-asneeded.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am -index 512e1ef..eda73ee 100644 ---- a/src/aaa_lib/Makefile.am -+++ b/src/aaa_lib/Makefile.am -@@ -49,11 +49,10 @@ else - LIBEFENCE = - endif - --libdir = ${prefix}/lib - lib_LTLIBRARIES = libmaloc.la ${LIBEFENCE} - - libmaloc_la_SOURCES = --libmaloc_la_LIBADD = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS} -+libmaloc_la_LIBADD = ${BASE_LIBS} ${VSYS_LIBS} ${VSH_LIBS} ${PSH_LIBS} -lreadline -lm - libmaloc_la_LDFLAGS = -version-info ${FETK_VERSION} - - libefence_la_SOURCES = diff --git a/dev-libs/maloc/files/1.4-doc.patch b/dev-libs/maloc/files/1.4-doc.patch deleted file mode 100644 index 73be364812cc..000000000000 --- a/dev-libs/maloc/files/1.4-doc.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am -index 2686292..8f77fe2 100644 ---- a/doc/doxygen/Makefile.am -+++ b/doc/doxygen/Makefile.am -@@ -29,14 +29,12 @@ - ## Author: Michael Holst - ## ########################################################################### - --docdir = @prefix@/doc/maloc -- - doc_DATA = maloc_doc - - maloc_doc: - $(doxygen_path) $(top_srcdir)/doc/doxygen/maloc.dox - - install-docDATA: -- mkdir -p $(docdir) -- cp -r ../api $(docdir)/ -+ mkdir -p $(DESTDIR)/@docdir@ -+ cp -r ../api $(DESTDIR)/@docdir@ - diff --git a/dev-libs/maloc/files/1.4-mpi.patch b/dev-libs/maloc/files/1.4-mpi.patch deleted file mode 100644 index 807d5ddc8d38..000000000000 --- a/dev-libs/maloc/files/1.4-mpi.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index d82b184..b8c5321 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -397,12 +397,14 @@ AC_SUBST(rl_inc) - dnl # ---------------------- - dnl # HANDLE THE MPI LIBRARY - dnl # ---------------------- -+mpi_use="" - AC_MSG_CHECKING([whether you want MPI]) --AC_ARG_ENABLE(mpi, -- [ --enable-mpi enable MPI layer [[default=no]]], -- [ mpi_use="yes" ], -- [ mpi_use="" ] --) -+AC_ARG_ENABLE([mpi], -+ AS_HELP_STRING([--enable-mpi enable MPI layer [[default=no]]])) -+ -+AS_IF([test "x$enable_mpi" = "xyes"], [ -+ mpi_use="yes" -+]) - mpi_lib=""; - mpi_inc=""; - if test -z "${mpi_use}"; then |