summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-10-31 14:23:12 +0000
committerJustin Lecher <jlec@gentoo.org>2010-10-31 14:23:12 +0000
commit5cd89e7e34d4721885b49a34b67d5468978c9536 (patch)
tree10062ae778ef9d3c2cfe85dd57c69b4f8634a4c8 /dev-libs/maloc/files
parentVersion bump wrt #337975 by Tyler Montbriand. (diff)
downloadgentoo-2-5cd89e7e34d4721885b49a34b67d5468978c9536.tar.gz
gentoo-2-5cd89e7e34d4721885b49a34b67d5468978c9536.tar.bz2
gentoo-2-5cd89e7e34d4721885b49a34b67d5468978c9536.zip
Version Bump
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/maloc/files')
-rw-r--r--dev-libs/maloc/files/1.4-asneeded.patch17
-rw-r--r--dev-libs/maloc/files/1.4-mpi.patch24
2 files changed, 41 insertions, 0 deletions
diff --git a/dev-libs/maloc/files/1.4-asneeded.patch b/dev-libs/maloc/files/1.4-asneeded.patch
new file mode 100644
index 000000000000..aed7299e089a
--- /dev/null
+++ b/dev-libs/maloc/files/1.4-asneeded.patch
@@ -0,0 +1,17 @@
+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-mpi.patch b/dev-libs/maloc/files/1.4-mpi.patch
new file mode 100644
index 000000000000..807d5ddc8d38
--- /dev/null
+++ b/dev-libs/maloc/files/1.4-mpi.patch
@@ -0,0 +1,24 @@
+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