diff options
author | Marlus Saraiva <marlus.saraiva@gmail.com> | 2015-07-03 04:20:11 +0000 |
---|---|---|
committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2015-07-04 18:39:57 +0200 |
commit | d353b4d850cc0ad9c4a99251e8d9e734080a49b5 (patch) | |
tree | aaebf90acac05a6d275ee3b6dafc3b5691b1debf /testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | |
parent | 499f4a72a2030ddd17a7612823c959ad803565c0 (diff) |
testing/erlang: update to 18.0.1
Diffstat (limited to 'testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch')
-rw-r--r-- | testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch new file mode 100644 index 00000000000..dcfa6bcfad7 --- /dev/null +++ b/testing/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -0,0 +1,57 @@ +From: Peter Lemenkov <lemenkov@gmail.com> +Date: Sat, 19 Jun 2010 09:59:39 +0400 +Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 + systems + +Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> + +--- otp_src_18.0-orig/lib/os_mon/doc/src/Makefile ++++ otp_src_18.0-fixed/lib/os_mon/doc/src/Makefile +@@ -36,12 +36,17 @@ + # Target Specs + # ---------------------------------------------------- + XML_APPLICATION_FILES = ref_man.xml ++ifeq ($(findstring win32,$(TARGET)),win32) ++NTEVENTLOG_DOCFILE=nteventlog.xml ++else ++NTEVENTLOG_DOCFILE= ++endif + XML_REF3_FILES = cpu_sup.xml \ + disksup.xml \ + memsup.xml \ + os_mon_mib.xml \ + os_sup.xml \ +- nteventlog.xml ++ $(NTEVENTLOG_DOCFILE) + + XML_REF6_FILES = os_mon_app.xml + +--- otp_src_18.0-orig/lib/os_mon/src/Makefile ++++ otp_src_18.0-fixed/lib/os_mon/src/Makefile +@@ -34,8 +34,13 @@ + # ---------------------------------------------------- + # Target Specs + # ---------------------------------------------------- ++ifeq ($(findstring win32,$(TARGET)),win32) ++NTEVENTLOG=nteventlog ++else ++NTEVENTLOG= ++endif + MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \ +- nteventlog ++ $(NTEVENTLOG) + + INCLUDE=../include + CSRC=../c_src +@@ -79,7 +84,11 @@ + # ---------------------------------------------------- + + $(APP_TARGET): $(APP_SRC) ../vsn.mk ++ifeq ($(findstring win32,$(TARGET)),win32) + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ ++else ++ $(vsn_verbose)sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@ ++endif + + $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + $(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@ |