[Pkg-erlang-commits] r1469 - in erlang/branches/experimental/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Sep 7 10:19:17 UTC 2012
Author: sgolovan
Date: 2012-09-07 10:19:16 +0000 (Fri, 07 Sep 2012)
New Revision: 1469
Modified:
erlang/branches/experimental/debian/changelog
erlang/branches/experimental/debian/patches/clean.patch
erlang/branches/experimental/debian/patches/docs.patch
erlang/branches/experimental/debian/patches/emacs.patch
erlang/branches/experimental/debian/patches/gnu.patch
erlang/branches/experimental/debian/patches/hppa.patch
erlang/branches/experimental/debian/patches/java.patch
erlang/branches/experimental/debian/patches/m68k.patch
erlang/branches/experimental/debian/patches/man.patch
erlang/branches/experimental/debian/patches/powerpc.patch
erlang/branches/experimental/debian/patches/rpath.patch
erlang/branches/experimental/debian/patches/sparc.patch
erlang/branches/experimental/debian/rules
Log:
[erlang-experimental]
* New upstream release (upload to experimental because of freeze).
* Refreshed patches.
* Added -j option to make calls in debian/rules to make the build faster
(the new upstream release supports parallel build).
Modified: erlang/branches/experimental/debian/changelog
===================================================================
--- erlang/branches/experimental/debian/changelog 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/changelog 2012-09-07 10:19:16 UTC (rev 1469)
@@ -1,8 +1,11 @@
-erlang (1:15.b.1-dfsg-4) UNRELEASED; urgency=low
+erlang (1:15.b.2-dfsg-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream release (upload to experimental because of freeze).
+ * Refreshed patches.
+ * Added -j option to make calls in debian/rules to make the build faster
+ (the new upstream release supports parallel build).
- -- Sergei Golovan <sgolovan at debian.org> Sat, 02 Jun 2012 10:59:43 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 07 Sep 2012 14:15:37 +0400
erlang (1:15.b.1-dfsg-3) unstable; urgency=low
Modified: erlang/branches/experimental/debian/patches/clean.patch
===================================================================
--- erlang/branches/experimental/debian/patches/clean.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/clean.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -3,9 +3,9 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-15.b.1-dfsg.orig/Makefile.in
-+++ erlang-15.b.1-dfsg/Makefile.in
-@@ -971,6 +971,7 @@
+--- erlang-15.b.2-dfsg.orig/Makefile.in
++++ erlang-15.b.2-dfsg/Makefile.in
+@@ -987,6 +987,7 @@
find . -type f -name SKIP -print | xargs $(RM)
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
@@ -13,7 +13,7 @@
#
# Just wipe out emulator, not libraries
-@@ -1006,3 +1007,185 @@
+@@ -1022,3 +1023,185 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
Modified: erlang/branches/experimental/debian/patches/docs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/docs.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/docs.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -3,8 +3,8 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang-15.b.1-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-15.b.1-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+--- erlang-15.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-15.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -508,7 +508,7 @@
<xsl:text>
.RS 2</xsl:text>
<xsl:text>
.LP
</xsl:text>
@@ -14,7 +14,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-@@ -794,7 +794,7 @@
+@@ -816,7 +816,7 @@
<xsl:template match="desc">
<xsl:text>
.RS</xsl:text>
<xsl:apply-templates/>
@@ -23,19 +23,19 @@
</xsl:template>
---- erlang-15.b.1-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-15.b.1-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-15.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-15.b.2-dfsg/lib/megaco/doc/src/Makefile
@@ -172,8 +172,6 @@
- $(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
- $(INSTALL_DIR) $(RELEASE_PATH)/man/man3
- $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
-- $(INSTALL_DIR) $(RELSYSDIR)/doc/standard
-- $(INSTALL_DATA) $(STANDARDS) $(RELSYSDIR)/doc/standard
+ $(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
+ $(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
+ $(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
+- $(INSTALL_DIR) "$(RELSYSDIR)/doc/standard"
+- $(INSTALL_DATA) $(STANDARDS) "$(RELSYSDIR)/doc/standard"
release_spec:
---- erlang-15.b.1-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-15.b.1-dfsg/lib/stdlib/doc/src/re.xml
+--- erlang-15.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-15.b.2-dfsg/lib/stdlib/doc/src/re.xml
@@ -344,7 +344,7 @@
metacharacter should not match before it. Setting this without
<c>multiline</c> (at compile time) causes circumflex never to
@@ -56,9 +56,9 @@
<tag><c>{offset, integer() >= 0}</c></tag>
---- erlang-15.b.1-dfsg.orig/lib/tools/Makefile
-+++ erlang-15.b.1-dfsg/lib/tools/Makefile
-@@ -23,7 +233,7 @@
+--- erlang-15.b.2-dfsg.orig/lib/tools/Makefile
++++ erlang-15.b.2-dfsg/lib/tools/Makefile
+@@ -23,7 +23,7 @@
# Macros
# ----------------------------------------------------
Modified: erlang/branches/experimental/debian/patches/emacs.patch
===================================================================
--- erlang/branches/experimental/debian/patches/emacs.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/emacs.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -3,8 +3,8 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-15.b.1-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-15.b.1-dfsg/lib/tools/emacs/erlang.el
+--- erlang-15.b.2-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-15.b.2-dfsg/lib/tools/emacs/erlang.el
@@ -496,8 +496,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
@@ -44,7 +44,7 @@
;; defvar some obsolete variables, which we still support for
;; backwards compatibility reasons.
-@@ -1965,7 +1964,7 @@
+@@ -1967,7 +1966,7 @@
(defun erlang-man-make-menu-item (file)
"Create a menu item containing the name of the man page."
@@ -53,7 +53,7 @@
(let ((page (substring file (match-beginning 1) (match-end 1))))
(list (capitalize page)
(list 'lambda '()
-@@ -1976,7 +1975,7 @@
+@@ -1978,7 +1977,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -1996,7 +1995,7 @@
+@@ -1998,7 +1997,7 @@
(if (or (null module) (string= module ""))
(error "No Erlang module name given"))
(let ((dir-list erlang-man-dirs)
@@ -71,7 +71,7 @@
(file nil)
file-list)
(while (and dir-list (null file))
-@@ -2137,9 +2136,9 @@
+@@ -2139,9 +2138,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/branches/experimental/debian/patches/gnu.patch
===================================================================
--- erlang/branches/experimental/debian/patches/gnu.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/gnu.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -11,9 +11,9 @@
(4) Switch some PATH_MAX occurrences to MAXPATHLEN;
---- erlang-15.b.1-dfsg.orig/erts/configure.in
-+++ erlang-15.b.1-dfsg/erts/configure.in
-@@ -433,7 +433,7 @@
+--- erlang-15.b.2-dfsg.orig/erts/configure.in
++++ erlang-15.b.2-dfsg/erts/configure.in
+@@ -425,7 +425,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -22,7 +22,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1175,7 +1175,7 @@
+@@ -1169,7 +1169,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -31,8 +31,8 @@
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
---- erlang-15.b.1-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-15.b.1-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-15.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-15.b.2-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
@@ -45,8 +45,8 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-15.b.1-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
-+++ erlang-15.b.1-dfsg/erts/emulator/drivers/common/inet_drv.c
+--- erlang-15.b.2-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
++++ erlang-15.b.2-dfsg/erts/emulator/drivers/common/inet_drv.c
@@ -532,6 +532,11 @@
inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
} while(0)
@@ -59,9 +59,9 @@
#endif /* __WIN32__ */
---- erlang-15.b.1-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-15.b.1-dfsg/erts/etc/common/erlexec.c
-@@ -1536,7 +1536,7 @@
+--- erlang-15.b.2-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-15.b.2-dfsg/erts/etc/common/erlexec.c
+@@ -1519,7 +1519,7 @@
if (!bindir) {
/* Determine bindir from absolute path to executable */
char *p;
@@ -70,7 +70,7 @@
strncpy(buffer, argv[0], sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
-@@ -1550,7 +1550,7 @@
+@@ -1533,7 +1533,7 @@
if (!rootdir) {
/* Determine rootdir from absolute path to bindir */
char *p;
@@ -79,8 +79,8 @@
strncpy(buffer, bindir, sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
---- erlang-15.b.1-dfsg.orig/erts/etc/common/escript.c
-+++ erlang-15.b.1-dfsg/erts/etc/common/escript.c
+--- erlang-15.b.2-dfsg.orig/erts/etc/common/escript.c
++++ erlang-15.b.2-dfsg/erts/etc/common/escript.c
@@ -53,7 +53,7 @@
# define IS_DIRSEP(c) ((c) == '/')
# define DIRSEPSTR "/"
@@ -90,8 +90,8 @@
# define ERL_NAME "erl"
#endif
---- erlang-15.b.1-dfsg.orig/erts/etc/unix/dyn_erl.c
-+++ erlang-15.b.1-dfsg/erts/etc/unix/dyn_erl.c
+--- erlang-15.b.2-dfsg.orig/erts/etc/unix/dyn_erl.c
++++ erlang-15.b.2-dfsg/erts/etc/unix/dyn_erl.c
@@ -149,8 +149,8 @@
static char *
find_prog(char *origpath)
Modified: erlang/branches/experimental/debian/patches/hppa.patch
===================================================================
--- erlang/branches/experimental/debian/patches/hppa.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/hppa.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -6,10 +6,10 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-15.b.1-dfsg.orig/erts/configure.in
-+++ erlang-15.b.1-dfsg/erts/configure.in
-@@ -1892,6 +1892,14 @@
- AC_CHECK_DECLS([posix2time],,,[#include <time.h>])
+--- erlang-15.b.2-dfsg.orig/erts/configure.in
++++ erlang-15.b.2-dfsg/erts/configure.in
+@@ -1888,6 +1888,14 @@
+ AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
disable_vfork=false
+AC_MSG_CHECKING([if vfork is to be disabled (for HPPA)])
Modified: erlang/branches/experimental/debian/patches/java.patch
===================================================================
--- erlang/branches/experimental/debian/patches/java.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/java.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-15.b.1-dfsg.orig/erts/configure.in
-+++ erlang-15.b.1-dfsg/erts/configure.in
-@@ -4354,7 +4354,8 @@
+--- erlang-15.b.2-dfsg.orig/erts/configure.in
++++ erlang-15.b.2-dfsg/erts/configure.in
+@@ -4381,7 +4381,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
ac_cv_prog_javac_ver_1_5,
@@ -18,9 +18,9 @@
ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
if test $ac_cv_prog_javac_ver_1_5 = no; then
unset -v JAVAC
---- erlang-15.b.1-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-15.b.1-dfsg/lib/test_server/src/configure.in
-@@ -399,7 +399,8 @@
+--- erlang-15.b.2-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-15.b.2-dfsg/lib/test_server/src/configure.in
+@@ -391,7 +391,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
ac_cv_prog_javac_ver_1_5,
Modified: erlang/branches/experimental/debian/patches/m68k.patch
===================================================================
--- erlang/branches/experimental/debian/patches/m68k.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/m68k.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-15.b.1-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-15.b.1-dfsg/erts/emulator/beam/binary.c
+--- erlang-15.b.2-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-15.b.2-dfsg/erts/emulator/beam/binary.c
@@ -31,6 +31,10 @@
#include "erl_binary.h"
#include "erl_bits.h"
@@ -20,8 +20,8 @@
#ifdef DEBUG
static int list_to_bitstr_buf(Eterm obj, char* buf, Uint len);
#else
---- erlang-15.b.1-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-15.b.1-dfsg/erts/emulator/beam/erl_driver.h
+--- erlang-15.b.2-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-15.b.2-dfsg/erts/emulator/beam/erl_driver.h
@@ -595,7 +595,7 @@
EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
extern const ErlDrvTermData driver_term_nil;
Modified: erlang/branches/experimental/debian/patches/man.patch
===================================================================
--- erlang/branches/experimental/debian/patches/man.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/man.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-15.b.1-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-15.b.1-dfsg/erts/etc/common/erlexec.c
-@@ -728,8 +728,10 @@
+--- erlang-15.b.2-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-15.b.2-dfsg/erts/etc/common/erlexec.c
+@@ -714,8 +714,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/branches/experimental/debian/patches/powerpc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/powerpc.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/powerpc.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -2,9 +2,9 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang-15.b.1-dfsg.orig/erts/configure.in
-+++ erlang-15.b.1-dfsg/erts/configure.in
-@@ -620,6 +620,7 @@
+--- erlang-15.b.2-dfsg.orig/erts/configure.in
++++ erlang-15.b.2-dfsg/erts/configure.in
+@@ -612,6 +612,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
macppc) ARCH=ppc;;
Modified: erlang/branches/experimental/debian/patches/rpath.patch
===================================================================
--- erlang/branches/experimental/debian/patches/rpath.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/rpath.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-15.b.1-dfsg.orig/erts/configure.in
-+++ erlang-15.b.1-dfsg/erts/configure.in
-@@ -4212,9 +4212,9 @@
+--- erlang-15.b.2-dfsg.orig/erts/configure.in
++++ erlang-15.b.2-dfsg/erts/configure.in
+@@ -4239,9 +4239,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/branches/experimental/debian/patches/sparc.patch
===================================================================
--- erlang/branches/experimental/debian/patches/sparc.patch 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/patches/sparc.patch 2012-09-07 10:19:16 UTC (rev 1469)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-15.b.1-dfsg.orig/erts/configure.in
-+++ erlang-15.b.1-dfsg/erts/configure.in
-@@ -609,7 +609,7 @@
+--- erlang-15.b.2-dfsg.orig/erts/configure.in
++++ erlang-15.b.2-dfsg/erts/configure.in
+@@ -601,7 +601,7 @@
fi
case $chk_arch_ in
@@ -16,9 +16,9 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-15.b.1-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-15.b.1-dfsg/erts/emulator/beam/beam_emu.c
-@@ -1031,16 +1031,6 @@
+--- erlang-15.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-15.b.2-dfsg/erts/emulator/beam/beam_emu.c
+@@ -984,16 +984,6 @@
* in registers.
*/
@@ -35,7 +35,7 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1049,7 +1039,6 @@
+@@ -1002,7 +992,6 @@
# define REG_fcalls
# define REG_tmp_arg1
# define REG_tmp_arg2
Modified: erlang/branches/experimental/debian/rules
===================================================================
--- erlang/branches/experimental/debian/rules 2012-09-06 16:37:02 UTC (rev 1468)
+++ erlang/branches/experimental/debian/rules 2012-09-07 10:19:16 UTC (rev 1469)
@@ -97,7 +97,7 @@
dh_testdir
dh_testroot
#
- [ ! -f Makefile ] || ${MAKE} clean
+ [ ! -f Makefile ] || ${MAKE} -j clean
rm -f lib/dialyzer/SKIP
#
# Remove installed erlang from debian/
@@ -186,7 +186,7 @@
#
echo "BUILDING HIPE VERSION (BUILD_HIPE: $(BUILD_HIPE))"
#
- [ ! -f Makefile ] || ${MAKE} clean
+ [ ! -f Makefile ] || ${MAKE} -j clean
rm -f lib/dialyzer/SKIP
#
CFLAGS="$(CFLAGS)" \
@@ -215,7 +215,7 @@
#
echo "BUILDING STANDARD VERSION (BUILD_HIPE: $(BUILD_HIPE))"
#
- [ ! -f Makefile ] || ${MAKE} clean
+ [ ! -f Makefile ] || ${MAKE} -j clean
rm -f lib/dialyzer/SKIP
#
CFLAGS="$(CFLAGS)" \
@@ -242,7 +242,7 @@
echo "*** do-install called for $(INSTALL_DIR)."
# Calls make install.
- ${MAKE} DESTDIR=$(INSTALL_DIR) TYPE=$(TYPE) install
+ ${MAKE} -j DESTDIR=$(INSTALL_DIR) TYPE=$(TYPE) install
# Replace ROOTDIR in "erl" and "start" scripts for real rootdir
# If there's no erl or start then it's better to fail than silently continue
@@ -281,7 +281,7 @@
rm -v $(INSTALL_DIR)/usr/lib/erlang/Install
rm -rv $(INSTALL_DIR)/usr/lib/erlang/misc
- # Copy forgotten HiPE sources to make sute they'll end up in the
+ # Copy forgotten HiPE sources to make sure they'll end up in the
# erlang-src package
for file in lib/hipe/*/*.erl lib/hipe/*/*.hrl lib/hipe/*/*.inc ; do \
fname=$$(basename $${file}) ; \
@@ -301,7 +301,7 @@
target=$$(basename $$(find make -type d |grep /)) ; \
PATH=$(ROOT_DIR)/bin:$$PATH ; \
for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
- make -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
+ ${MAKE} -j -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
done
#
install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
@@ -322,26 +322,26 @@
dh_testdir
touch build-hipe-stamp
ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
- ${MAKE} TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
- ${MAKE} TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
+ ${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
+ ${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
endif
- ${MAKE} TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)"
+ ${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)"
build-stnd: build-stnd-stamp
build-stnd-stamp: configure-stnd-stamp
dh_testdir
ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
- ${MAKE} TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
- ${MAKE} TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
+ ${MAKE} -j TYPE=$(TYPE) FLAVOR=smp GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
+ ${MAKE} -j TYPE=$(TYPE) FLAVOR=plain GEN_OPT_FLGS="$(GEN_OPT_FLGS)" emulator
endif
- ${MAKE} TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)"
+ ${MAKE} -j TYPE=$(TYPE) GEN_OPT_FLGS="$(GEN_OPT_FLGS)"
touch build-stnd-stamp
docs: docs-stamp
docs-stamp: $(INSTALL_RULE)
dh_testdir
- PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) docs
- $(MAKE) DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
+ PATH=$(ROOT_DIR)/bin:$$PATH $(MAKE) -j docs
+ $(MAKE) -j DESTDIR=$(ROOT_DIR)/debian/erlang-docs install-docs
#
sh debian/scripts/fixmanpages $(MAN_DIR) 2
#
@@ -513,8 +513,8 @@
binary: binary-indep binary-arch
-REL=R15B01
-DEB_REL=15.b.1-dfsg
+REL=R15B02
+DEB_REL=15.b.2-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
More information about the Pkg-erlang-commits
mailing list