rpms/erlang
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

R14B-01.2: Update package to rebased patches

Browse Source
This commit is contained in:
Hans Ulrich Niedermann 2010-12-15 16:51:52 +01:00
parent 757e49bf92
commit b614669d3e
14 changed files with 116 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
erlang.spec
View File

@ -17,7 +17,7 @@
Name: erlang
Version: %{upstream_ver}
Release: %{upstream_rel_for_rpm}.1%{?dist}
Release: %{upstream_rel_for_rpm}.2%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@ -28,6 +28,7 @@ Source0: http://www.erlang.org/download/otp_src_%{upstream_ver}%{upstream_rel}.t
Source1: http://erlang.org/download/otp_doc_html_%{upstream_ver}%{upstream_rel}.tar.gz
Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.tar.gz
%endif
# For the source of the Fedora specific patches, see the respective
# branch at https://github.com/lemenkov/otp
#
@ -41,30 +42,29 @@ Source2: http://erlang.org/download/otp_doc_man_%{upstream_ver}%{upstream_rel}.t
# $ ./otp-get-patches.sh /path/to/otp OTP_R14B01 lemenkov/fedora-R14B01
# for some semi-automatic patch update assistance.
#
# Fedora-specific
Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
# Fedora-specific
Patch2: otp-0002-Remove-rpath.patch
# Fedora-specific
Patch4: otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
# Fedora-specific
Patch5: otp-0005-Do-not-install-C-sources.patch
# Fedora-specific
Patch6: otp-0006-Do-not-install-Java-sources.patch
# Fedora-specific
Patch7: otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch
# Fedora-specific
Patch8: otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
# Fedora-specific
Patch9: otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch
# Fedora-specific
Patch10: otp-0010-Do-not-install-VxWorks-specific-docs.patch
# Fedora-specific
Patch11: otp-0011-Do-not-install-erlang-sources.patch
# Backported from upstream
Patch12: otp-0012-Fix-installation-of-example-file.patch
# Required for RHEL 5,6 for PowerPC only
Patch13: otp-0013-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
# Fedora specific patch
Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
# Fedora specific patch
Patch2: otp-0002-Remove-rpath.patch
# Fedora specific patch
Patch3: otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch
# Fedora specific patch
Patch4: otp-0004-Do-not-install-C-sources.patch
# Fedora specific patch
Patch5: otp-0005-Do-not-install-Java-sources.patch
# Fedora specific patch
Patch6: otp-0006-Do-not-install-info-files-they-are-almost-empty-and-.patch
# Fedora specific patch
Patch7: otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
# Fedora specific patch
Patch8: otp-0008-Do-not-install-.bat-files-on-non-win32-machines.patch
# Fedora specific patch
Patch9: otp-0009-Do-not-install-VxWorks-specific-docs.patch
# Fedora specific patch
Patch10: otp-0010-Do-not-install-erlang-sources.patch
# Required only for el5, el6 on PowerPC
Patch11: otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@ -946,20 +946,19 @@ Erlang mode for XEmacs (source lisp files).
%prep
%setup -q -n otp_src_%{upstream_ver}%{upstream_rel}
%patch1 -p1 -b .do_not_format_manpages
%patch2 -p1 -b .rpath
%patch4 -p1 -b .dlopen_opengl_libs
%patch5 -p1 -b .no_c_sources
%patch6 -p1 -b .no_java_sources
%patch7 -p1 -b .no_info_files
%patch8 -p1 -b .no_win32_nteventlog
%patch9 -p1 -b .no_win32_bat_files
%patch10 -p1 -b .no_vxworks_specific
%patch11 -p1 -b .no_erlang_sources
%patch12 -p1 -b .install_example_file_properly
%patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan
%patch2 -p1 -b .Remove_rpath
%patch3 -p1 -b .Fix_for_dlopening_libGL_and_libGLU
%patch4 -p1 -b .Do_not_install_C_sources
%patch5 -p1 -b .Do_not_install_Java_sources
%patch6 -p1 -b .Do_not_install_info_files_they_are_almost_empty_and_
%patch7 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
%patch8 -p1 -b .Do_not_install_bat_files_on_non_win32_machines
%patch9 -p1 -b .Do_not_install_VxWorks_specific_docs
%patch10 -p1 -b .Do_not_install_erlang_sources
%if 0%{?el4}%{?el5}%{?el6}
%ifnarch %{ix86} x86_64
%patch13 -p1 -b .no_unicode_in_java-150-gcj_for_ppc
%patch11 -p1 -b .Ugly_workaround_for_java_1_5_0_gcj_which_doesn_t_sup
%endif
%endif
# remove shipped zlib sources
@ -2240,6 +2239,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Dec 15 2010 Hans Ulrich Niedermann <hun@n-dimensional.de> - R14B-01.2
- Update to rebased patches
* Mon Dec 13 2010 Hans Ulrich Niedermann <hun@n-dimensional.de> - R14B-01.1
- Update to upstream release R14B01 (the patches still need work)

12
otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
View File

@ -1,7 +1,7 @@
From 21cd120e8c44f65a53b9aa1ba676df53592c5ec7 Mon Sep 17 00:00:00 2001
From d3aef1b288b667d07a560d90041598eae4c4f20e Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Feb 2010 16:45:28 +0300
Subject: [PATCH 01/13] Do not format man-pages and do not install miscellaneous
Subject: [PATCH 01/11] Do not format man-pages and do not install miscellaneous
utilities for dealing with man-pages.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
@ -11,7 +11,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
index 9665566..a82627d 100644
index 4754328..080cac6 100644
--- a/erts/etc/common/Makefile.in
+++ b/erts/etc/common/Makefile.in
@@ -537,10 +537,6 @@ endif
@ -26,10 +26,10 @@ index 9665566..a82627d 100644
$(INSTALL_DIR) $(RELEASE_PATH)/build_erl_ose
cd $(OSEETC) && $(TAR) erl_ose_$(SYSTEM_VSN).tar $(INSTALL_ERL_OSE)
diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
index 7dead62..e522365 100644
index 8f40c43..7f354cf 100644
--- a/erts/etc/unix/Install.src
+++ b/erts/etc/unix/Install.src
@@ -140,14 +140,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
@@ -143,14 +143,4 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
cp -p $Name.boot start.boot
cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
@ -45,5 +45,5 @@ index 7dead62..e522365 100644
-
exit 0
--
1.7.3.2
1.7.3.3

6
otp-0002-Remove-rpath.patch
View File

@ -1,7 +1,7 @@
From a2e70caa1cf05c1dd8038cda557de60f935d4d6b Mon Sep 17 00:00:00 2001
From f2cadfdf12de274fac64649726745333ae4ad3ac Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 25 Feb 2010 16:57:43 +0300
Subject: [PATCH 02/13] Remove rpath
Subject: [PATCH 02/11] Remove rpath
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -68,5 +68,5 @@ index 49a209f..5e6c74e 100644
SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@
--
1.7.3.2
1.7.3.3

28
otp-0003-Fix-for-dlopening-libGL-and-libGLU.patch Normal file
View File

@ -0,0 +1,28 @@
From 576c399f2226f8bdf6ae6f94038d204d5f8693c9 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 16 Apr 2010 21:13:47 +0400
Subject: [PATCH 03/11] Fix for dlopening libGL and libGLU
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
lib/wx/c_src/egl_impl.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/wx/c_src/egl_impl.cpp b/lib/wx/c_src/egl_impl.cpp
index e2dbbb7..56e560f 100644
--- a/lib/wx/c_src/egl_impl.cpp
+++ b/lib/wx/c_src/egl_impl.cpp
@@ -70,8 +70,8 @@ typedef char DL_CHAR;
# define OPENGL_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
# define OPENGLU_LIB "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
# else
-# define OPENGL_LIB "libGL.so"
-# define OPENGLU_LIB "libGLU.so"
+# define OPENGL_LIB "libGL.so.1"
+# define OPENGLU_LIB "libGLU.so.1"
# endif
#endif
extern "C" {
--
1.7.3.3

6
otp-0005-Do-not-install-C-sources.patch → otp-0004-Do-not-install-C-sources.patch
View File

@ -1,7 +1,7 @@
From 307ed0abc8e61a3b7b6af2e979b3a83d8ff81cce Mon Sep 17 00:00:00 2001
From 1546111ae258101825045a7ca656078349b73e7c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 18 Jun 2010 23:41:33 +0400
Subject: [PATCH 05/13] Do not install C sources
Subject: [PATCH 04/11] Do not install C sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -168,5 +168,5 @@ index 65a7f5f..144c1ba 100644
$(INSTALL_DIR) $(RELSYSDIR)/bin
$(INSTALL_PROGRAM) $(PROGS) $(RELSYSDIR)/bin
--
1.7.3.2
1.7.3.3

35
otp-0004-Fix-for-dlopening-libGL-and-libGLU.patch
View File

@ -1,35 +0,0 @@
From 49170da856728f50c5e5eea9a062ee6cf9718cc3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 16 Apr 2010 21:13:47 +0400
Subject: [PATCH 04/13] Fix for dlopening libGL and libGLU
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
lib/wx/c_src/wxe_gl.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp
index 63dd68f..36bf15f 100644
--- a/lib/wx/c_src/wxe_gl.cpp
+++ b/lib/wx/c_src/wxe_gl.cpp
@@ -81,7 +81,7 @@ int initOpenGL()
WCHAR * DLName = wxT("opengl32.dll");
HMODULE LIBhandle = LoadLibrary(DLName);
#else
- char * DLName = (char *) "libGL.so";
+ char * DLName = (char *) "libGL.so.1";
void * LIBhandle = dlopen(DLName, RTLD_LAZY);
#endif
// fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
@@ -132,7 +132,7 @@ int initOpenGL()
DLName = wxT("glu32.dll");
LIBhandle = LoadLibrary(DLName);
#else
- DLName = (char *) "libGLU.so";
+ DLName = (char *) "libGLU.so.1";
LIBhandle = dlopen(DLName, RTLD_LAZY);
#endif
// fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName);
--
1.7.3.2

6
otp-0006-Do-not-install-Java-sources.patch → otp-0005-Do-not-install-Java-sources.patch
View File

@ -1,7 +1,7 @@
From b893fff74eef26267652f2e58136ce31c508d1ad Mon Sep 17 00:00:00 2001
From 0c0230527a3e3ec32c0739c5aa6ae365593ec9a9 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 09:25:18 +0400
Subject: [PATCH 06/13] Do not install Java sources
Subject: [PATCH 05/11] Do not install Java sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -36,5 +36,5 @@ index d0ff9cd..9990d2b 100644
$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) $(RELSYSDIR)/priv
--
1.7.3.2
1.7.3.3

10
otp-0007-Do-not-install-info-files-they-are-almost-empty-and-.patch → otp-0006-Do-not-install-info-files-they-are-almost-empty-and-.patch
View File

@ -1,7 +1,7 @@
From 71b4e3a73fff283fcf97bfd2f570a5b071a7ae40 Mon Sep 17 00:00:00 2001
From 9652244614a04e252555a36b1b7dbb669a56df10 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 09:29:12 +0400
Subject: [PATCH 07/13] Do not install info files - they are almost empty and useless
Subject: [PATCH 06/11] Do not install info files - they are almost empty and useless
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -289,7 +289,7 @@ index e20b398..0000000
-group: comm
-short: Provides support for Abstract Syntax Notation One
diff --git a/lib/common_test/doc/src/Makefile b/lib/common_test/doc/src/Makefile
index 6322860..3f402fc 100644
index 1a767a8..0d9caa2 100644
--- a/lib/common_test/doc/src/Makefile
+++ b/lib/common_test/doc/src/Makefile
@@ -91,8 +91,6 @@ XML_FILES=$(XML_APPLICATION_FILES) $(XML_REF1_FILES) $(XML_REF3_FILES) $(XML_RE
@ -864,7 +864,7 @@ index 984e427..0000000
-short: Erlang and provides tools for collection and graphical
-short: viewing of trace data.
diff --git a/lib/eunit/doc/src/Makefile b/lib/eunit/doc/src/Makefile
index 19be96d..59b39a3 100644
index 2cdc579..4a952eb 100644
--- a/lib/eunit/doc/src/Makefile
+++ b/lib/eunit/doc/src/Makefile
@@ -75,8 +75,6 @@ XML_FILES = \
@ -1955,5 +1955,5 @@ index 81d16ab..0000000
-group: comm
-short: Provides support for XML 1.0
--
1.7.3.2
1.7.3.3

6
otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch → otp-0007-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
View File

@ -1,7 +1,7 @@
From 552623edb7fd3124d0a0e82304b744d77eddc69b Mon Sep 17 00:00:00 2001
From 02e9c2f2583b3d1b706af4fa05d6efc33cc293b8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 09:59:39 +0400
Subject: [PATCH 08/13] Do not install nteventlog and related doc-files on non-win32 systems
Subject: [PATCH 07/11] Do not install nteventlog and related doc-files on non-win32 systems
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -64,5 +64,5 @@ index 9a75446..a492a63 100644
$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
sed -e 's;%VSN%;$(VSN);' $< > $@
--
1.7.3.2
1.7.3.3

8
otp-0009-Do-not-install-.bat-files-on-non-win32-machines.patch → otp-0008-Do-not-install-.bat-files-on-non-win32-machines.patch
View File

@ -1,7 +1,7 @@
From 5d52142fcfa2b4a776f80592ae0033e17628adb7 Mon Sep 17 00:00:00 2001
From 811adac1504284c12bdacc42d11975968cfa05dc Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 10:25:29 +0400
Subject: [PATCH 09/13] Do not install *.bat files on non-win32 machines
Subject: [PATCH 08/11] Do not install *.bat files on non-win32 machines
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index dde1ea1..fe5eba1 100644
index b4eb518..353daef 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -56,11 +56,15 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
@ -51,5 +51,5 @@ index 56ab772..c29e912 100644
# ----------------------------------------------------
# FLAGS
--
1.7.3.2
1.7.3.3

6
otp-0010-Do-not-install-VxWorks-specific-docs.patch → otp-0009-Do-not-install-VxWorks-specific-docs.patch
View File

@ -1,7 +1,7 @@
From 659867f485cea9959b7641bd0f83d290759a7170 Mon Sep 17 00:00:00 2001
From 47622f8eb33a9327d1e625e6e89da8a47e1bd9ba Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 11:26:04 +0400
Subject: [PATCH 10/13] Do not install VxWorks-specific docs
Subject: [PATCH 09/11] Do not install VxWorks-specific docs
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -21,5 +21,5 @@ index be99288..4bb07c4 100644
erl_prim_loader.xml \
erlang.xml \
--
1.7.3.2
1.7.3.3

32
otp-0011-Do-not-install-erlang-sources.patch → otp-0010-Do-not-install-erlang-sources.patch
View File

@ -1,7 +1,7 @@
From dcf186ea937a12d3aa28adc2431774bc56b43335 Mon Sep 17 00:00:00 2001
From 31648032919445e22066c83891dca60c1eb2fae6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 19 Jun 2010 13:21:10 +0400
Subject: [PATCH 11/13] Do not install erlang sources
Subject: [PATCH 10/11] Do not install erlang sources
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -82,10 +82,10 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
74 files changed, 58 insertions(+), 99 deletions(-)
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
index 785ad53..57a58ab 100644
index 1456388..81db627 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -86,8 +86,6 @@ cancel:
@@ -68,8 +68,6 @@ copy:
include $(ERL_TOP)/make/otp_release_targets.mk
release_spec:
@ -474,10 +474,10 @@ index 19b9387..f3ff8bf 100644
$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
index 575c6ef..9531676 100644
index 0397b48..2692c7c 100644
--- a/lib/inets/src/http_client/Makefile
+++ b/lib/inets/src/http_client/Makefile
@@ -93,7 +93,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src
$(INSTALL_DIR) $(RELSYSDIR)/src/http_client
@ -487,10 +487,10 @@ index 575c6ef..9531676 100644
$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
index 5dac3b0..9ca3a60 100644
index aaf3cfb..0236a49 100644
--- a/lib/inets/src/http_lib/Makefile
+++ b/lib/inets/src/http_lib/Makefile
@@ -88,7 +88,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -89,7 +89,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src
$(INSTALL_DIR) $(RELSYSDIR)/src/http_lib
@ -500,10 +500,10 @@ index 5dac3b0..9ca3a60 100644
$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index 879e605..89ed618 100644
index bdd8c5e..64d971f 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -124,7 +124,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -126,7 +126,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src
$(INSTALL_DIR) $(RELSYSDIR)/src/http_server
@ -667,7 +667,7 @@ index e032f56..e357187 100644
$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index fe5eba1..fa5f2d0 100644
index 353daef..c61d157 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -113,7 +113,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@ -676,8 +676,8 @@ index fe5eba1..fa5f2d0 100644
$(INSTALL_DIR) $(RELSYSDIR)/src
- $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR)/src
$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
$(INSTALL_DIR) $(RELSYSDIR)/include
$(INSTALL_DIR) $(RELSYSDIR)/examples
$(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
index b48dd76..deb9947 100644
--- a/lib/odbc/src/Makefile
@ -1037,10 +1037,10 @@ index 62845cd..841cf11 100644
$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
$(RELSYSDIR)/ebin
diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
index a9fd468..9b7f844 100644
index 3cc6683..83c5168 100644
--- a/lib/wx/src/Makefile
+++ b/lib/wx/src/Makefile
@@ -113,9 +113,9 @@ ifeq ($(INSIDE_ERLSRC), true)
@@ -112,9 +112,9 @@ ifeq ($(INSIDE_ERLSRC), true)
include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src
@ -1068,5 +1068,5 @@ index 7009b50..c9c7303 100644
$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
--
1.7.3.2
1.7.3.3

6
otp-0013-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch → otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch
View File

@ -1,7 +1,7 @@
From d3ad001ea7a026eb07528fe8bf27f605297f5555 Mon Sep 17 00:00:00 2001
From 611a24a8d1f497582cd2deb3a57b9e16cc0f66db Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 21 Nov 2010 00:17:49 +0300
Subject: [PATCH 13/13] Ugly workaround for java-1.5.0-gcj which doesn't support UNICODE fully
Subject: [PATCH 11/11] Ugly workaround for java-1.5.0-gcj which doesn't support UNICODE fully
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
@ -59,5 +59,5 @@ index b9b4348..c11702c 100644
throw new OtpErlangDecodeException(
"Wrong tag encountered, expected " + OtpExternal.stringTag
--
1.7.3.2
1.7.3.3

27
otp-0012-Fix-installation-of-example-file.patch
View File

@ -1,27 +0,0 @@
From ef692abf68c739722e499f9a564eaa510306fdeb Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 16 Sep 2010 14:43:19 +0400
Subject: [PATCH 12/13] Fix installation of example file
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
lib/observer/src/Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index fa5f2d0..c61d157 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -114,7 +114,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src
$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(RELSYSDIR)/src
- $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/src
+ $(INSTALL_DIR) $(RELSYSDIR)/examples
+ $(INSTALL_DATA) $(EXAMPLE_FILES) $(RELSYSDIR)/examples
$(INSTALL_DIR) $(RELSYSDIR)/include
$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/include
$(INSTALL_DIR) $(RELSYSDIR)/ebin
--
1.7.3.2