This commit was manufactured by cvs2git to create branch 'unlabeled-1.24.2'.

Sprout from master 2005-12-16 15:18:36 UTC deejay1 <deejay1@pld-linux.org> '- rel. 1, SOA #1'
Delete:
    erlang-fPIC.patch
    erlang-hipe_optimistic_regalloc_once_only.patch
    erlang-optional_java.patch

diff --git a/erlang-fPIC.patch b/erlang-fPIC.patch
deleted file mode 100644 (file)
index 2f94b30..0000000
--- a/erlang-fPIC.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -dur otp_src_R9C-2.orig/lib/crypto/c_src/Makefile.in otp_src_R9C-2/lib/crypto/c_src/Makefile.in
---- otp_src_R9C-2.orig/lib/crypto/c_src/Makefile.in    2003-07-07 14:32:05.000000000 +0200
-+++ otp_src_R9C-2/lib/crypto/c_src/Makefile.in 2004-09-01 13:03:20.908573964 +0200
-@@ -56,7 +56,7 @@
- TYPE_FLAGS = -O2
- endif
- 
--ALL_CFLAGS = @CFLAGS@ @DEFS@ $(TYPE_FLAGS) $(INCLUDES)
-+ALL_CFLAGS = @CFLAGS@ @DEFS@ @DED_CFLAGS@ $(TYPE_FLAGS) $(INCLUDES)
- 
- # ----------------------------------------------------
- # Release directory specification
-diff -dur otp_src_R9C-2.orig/lib/ic/c_src/Makefile.in otp_src_R9C-2/lib/ic/c_src/Makefile.in
---- otp_src_R9C-2.orig/lib/ic/c_src/Makefile.in        2004-04-08 14:44:14.000000000 +0200
-+++ otp_src_R9C-2/lib/ic/c_src/Makefile.in     2004-09-01 13:04:34.243490871 +0200
-@@ -110,7 +110,7 @@
- 
- OBJ_FILES= $(C_FILES:%.c=$(OBJDIR)/%.o) 
- 
--ALL_CFLAGS = @CFLAGS@ @DEFS@ -I$(INCDIR) $(ERL_INTERFACE_FLAGS) $(CFLAGS) 
-+ALL_CFLAGS = @CFLAGS@ @DEFS@ @DED_CFLAGS@ -I$(INCDIR) $(ERL_INTERFACE_FLAGS) $(CFLAGS) 
- 
- # ----------------------------------------------------
- # Targets
-Only in otp_src_R9C-2/lib/ic/c_src: Makefile.in~
-diff -dur otp_src_R9C-2.orig/lib/odbc/c_src/Makefile.in otp_src_R9C-2/lib/odbc/c_src/Makefile.in
---- otp_src_R9C-2.orig/lib/odbc/c_src/Makefile.in      2004-05-25 19:37:40.000000000 +0200
-+++ otp_src_R9C-2/lib/odbc/c_src/Makefile.in   2004-09-01 13:05:27.679036798 +0200
-@@ -83,7 +83,7 @@
- 
- EIINCLUDE = $(EIROOT)/include
- INCLUDES = -I. -I$(EIINCLUDE) -I$(ODBCINCLUDE)
--CFLAGS = $(subst -O2,-g,@CFLAGS32@)
-+CFLAGS = $(subst -O2,-g,@CFLAGS32@) @DED_CFLAGS@
- #CFLAGS = @CFLAGS32@
- LDFLAGS += -g
- CC = @CC32@
-Only in otp_src_R9C-2/lib/odbc/c_src: Makefile.in~
-diff -dur otp_src_R9C-2.orig/lib/orber/c_src/Makefile.in otp_src_R9C-2/lib/orber/c_src/Makefile.in
---- otp_src_R9C-2.orig/lib/orber/c_src/Makefile.in     2003-07-22 15:27:15.000000000 +0200
-+++ otp_src_R9C-2/lib/orber/c_src/Makefile.in  2004-09-01 13:06:07.082853761 +0200
-@@ -64,7 +64,7 @@
- TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%)
- OBJ_FILES= $(C_FILES:%.c=$(OBJDIR)/%.o) 
- 
--ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS) 
-+ALL_CFLAGS = @CFLAGS@ @DED_CFLAGS@ @DEFS@ $(CFLAGS) 
- 
- # ----------------------------------------------------
- # Targets
-Only in otp_src_R9C-2/lib/orber/c_src: Makefile.in~
-diff -dur otp_src_R9C-2.orig/lib/os_mon/c_src/Makefile.in otp_src_R9C-2/lib/os_mon/c_src/Makefile.in
---- otp_src_R9C-2.orig/lib/os_mon/c_src/Makefile.in    2003-07-07 14:05:00.000000000 +0200
-+++ otp_src_R9C-2/lib/os_mon/c_src/Makefile.in 2004-09-01 13:06:38.578524410 +0200
-@@ -68,7 +68,7 @@
- 
- TARGET_FILES= $(PROGRAMS:%=$(BINDIR)/%)
- 
--ALL_CFLAGS = @CFLAGS@ @DEFS@ $(CFLAGS)
-+ALL_CFLAGS = @CFLAGS@ @DEFS@ @DED_CFLAGS@ $(CFLAGS)
- 
- # ----------------------------------------------------
- # Targets
-Only in otp_src_R9C-2/lib/os_mon/c_src: Makefile.in~
-diff -dur otp_src_R9C-2.orig/lib/ssl/c_src/Makefile.in otp_src_R9C-2/lib/ssl/c_src/Makefile.in
---- otp_src_R9C-2.orig/lib/ssl/c_src/Makefile.in       2004-04-22 13:14:28.000000000 +0200
-+++ otp_src_R9C-2/lib/ssl/c_src/Makefile.in    2004-09-01 13:07:22.272353241 +0200
-@@ -44,7 +44,7 @@
- # Includes and libs
- # ----------------------------------------------------
- 
--ALL_CFLAGS = @WFLAGS@ @CFLAGS@ @DEFS@ $(TYPE_FLAGS)
-+ALL_CFLAGS = @WFLAGS@ @DED_CFLAGS@ @CFLAGS@ @DEFS@ $(TYPE_FLAGS)
- TARGET = @host@
- 
- ifeq ($(TYPE),debug)
-Only in otp_src_R9C-2/lib/ssl/c_src: Makefile.in~

diff --git a/erlang-hipe_optimistic_regalloc_once_only.patch b/erlang-hipe_optimistic_regalloc_once_only.patch
deleted file mode 100644 (file)
index ebf23ae..0000000
--- a/erlang-hipe_optimistic_regalloc_once_only.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- otp_src_R10B-7/lib/hipe/regalloc/Makefile.orig     2005-08-29 15:15:24.000000000 +0200
-+++ otp_src_R10B-7/lib/hipe/regalloc/Makefile  2005-09-27 22:33:56.000000000 +0200
-@@ -43,7 +43,6 @@
-         hipe_temp_map \
-         hipe_optimistic_regalloc \
-         hipe_coalescing_regalloc \
--        hipe_optimistic_regalloc \
-         hipe_graph_coloring_regalloc \
-         hipe_regalloc_loop \
-         hipe_ls_regalloc \

diff --git a/erlang-optional_java.patch b/erlang-optional_java.patch
deleted file mode 100644 (file)
index c8d01db..0000000
--- a/erlang-optional_java.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -dur otp_src_R9C-2.orig/erts/configure.in otp_src_R9C-2/erts/configure.in
---- otp_src_R9C-2.orig/erts/configure.in       2004-05-24 08:05:38.000000000 +0200
-+++ otp_src_R9C-2/erts/configure.in    2004-10-10 23:11:12.516218543 +0200
-@@ -1262,7 +1262,13 @@
-   /bin/rm -f $ERL_TOP/lib/$a/SKIP
- done
- 
--AC_CHECK_PROGS(JAVAC, javac.sh javac guavac gcj jikes bock)
-+JAVAC=""
-+AC_ARG_WITH([java],AS_HELP_STRING([--with-java],[use Java (default is auto)]),
-+  [],[with_java=auto])
-+
-+if test "x$with_java" != "xno" ; then
-+ AC_CHECK_PROGS(JAVAC, javac.sh javac guavac gcj jikes bock)
-+fi
- if test -n "$JAVAC"; then
-   dnl Make sure it's at least JDK 1.2
-   AC_CACHE_CHECK(for JDK version 1.2, 
-@@ -1274,7 +1280,13 @@
-   fi
- fi
- if test -z "$JAVAC"; then
--  AC_MSG_WARN([Could not find any usable java compiler, will skip: jinterface])
-+  if test "x$with_java" = "xyes" ; then
-+    AC_MSG_ERROR([could not find any usable java compiler])
-+  elif test "x$with_java" != "xno" ; then
-+    AC_MSG_WARN([Could not find any usable java compiler, will skip: jinterface])
-+  else
-+    AC_MSG_WARN([Java support disabled, will skip: jinterface])
-+  fi
- 
-   for a in $need_java ; do
-       echo "No Java compiler found" > $ERL_TOP/lib/$a/SKIP
-Only in otp_src_R9C-2/erts: configure.in~