diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
commit | bdf817c3549ba377334deb1161de703579670d62 (patch) | |
tree | c1b80c05c917cda2619e267049978f971bdad169 /extra/ocaml | |
parent | df609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff) | |
parent | 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-client/PKGBUILD
community/dcron/PKGBUILD
community/freevo/PKGBUILD
community/gmerlin-avdecoder/PKGBUILD
community/hacburn/PKGBUILD
community/htmldoc/PKGBUILD
community/ibus-table/PKGBUILD
community/iksemel/PKGBUILD
community/isomaster/PKGBUILD
community/libmatio/PKGBUILD
community/libtlen/PKGBUILD
community/luarocks/PKGBUILD
community/lxde-common/PKGBUILD
community/multipath-tools/PKGBUILD
community/nvclock/PKGBUILD
community/pam-krb5/PKGBUILD
community/pidgin-musictracker/PKGBUILD
community/pkgfile/PKGBUILD
community/pkgtools/PKGBUILD
community/print-manager/PKGBUILD
community/python-pyro/PKGBUILD
community/python-pyxmpp/PKGBUILD
community/python2-simplejson/PKGBUILD
community/rsnapshot/PKGBUILD
community/setconf/PKGBUILD
community/tagpy/PKGBUILD
community/terminator/PKGBUILD
community/udunits/PKGBUILD
community/vlock/PKGBUILD
community/winefish/PKGBUILD
core/nss-myhostname/PKGBUILD
extra/avfs/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/bmp-wma/PKGBUILD
extra/bochs/PKGBUILD
extra/botan/PKGBUILD
extra/cdargs/PKGBUILD
extra/cx_freeze/PKGBUILD
extra/dcfldd/PKGBUILD
extra/devilspie/PKGBUILD
extra/emelfm2/PKGBUILD
extra/evilwm/PKGBUILD
extra/fssos-nsvs/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gmpc/PKGBUILD
extra/gtkpod/PKGBUILD
extra/hercules/PKGBUILD
extra/herqq/PKGBUILD
extra/hydrogen/PKGBUILD
extra/kdegames/PKGBUILD
extra/kradio/PKGBUILD
extra/kshutdown/PKGBUILD
extra/libmusicbrainz4/PKGBUILD
extra/mahjong/PKGBUILD
extra/mcrypt/PKGBUILD
extra/monica/PKGBUILD
extra/mpck/PKGBUILD
extra/mrtg/PKGBUILD
extra/nicotine/PKGBUILD
extra/normalize/PKGBUILD
extra/oprofile/PKGBUILD
extra/perl-event/PKGBUILD
extra/perl-unicode-string/PKGBUILD
extra/pidgin-encryption/PKGBUILD
extra/proftpd/PKGBUILD
extra/pymad/PKGBUILD
extra/qiv/PKGBUILD
extra/quodlibet/PKGBUILD
extra/ratpoison/PKGBUILD
extra/rox/PKGBUILD
extra/scrot/PKGBUILD
extra/stardict/PKGBUILD
extra/terminal/PKGBUILD
extra/usbview/PKGBUILD
extra/xdelta/PKGBUILD
extra/xdelta3/PKGBUILD
extra/xorg-xlsfonts/PKGBUILD
extra/zile/PKGBUILD
mozilla-testing/iceweasel-libre/mozconfig
mozilla-testing/iceweasel-libre/vendor.js
social/tokyocabinet/PKGBUILD
~fauno/notmuch/PKGBUILD
~mtjm/thinkfan/PKGBUILD
~mtjm/zbar/PKGBUILD
Diffstat (limited to 'extra/ocaml')
-rw-r--r-- | extra/ocaml/fix-ocaml-binutils-2.21.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/extra/ocaml/fix-ocaml-binutils-2.21.patch b/extra/ocaml/fix-ocaml-binutils-2.21.patch deleted file mode 100644 index fa7664cec..000000000 --- a/extra/ocaml/fix-ocaml-binutils-2.21.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Stephane Glondu <steph@glondu.net> -Date: Tue, 8 Mar 2011 21:17:40 +0100 -Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: http://caml.inria.fr/mantis/view.php?id=5237 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 -Authors: Eric Cooper, spiralvoice -Reviewed-by: Stéphane Glondu <steph@glondu.net> ---- - asmcomp/amd64/emit.mlp | 13 +++++++------ - asmcomp/i386/emit.mlp | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp -index 4a3f844..525c6e6 100644 ---- a/asmcomp/amd64/emit.mlp -+++ b/asmcomp/amd64/emit.mlp -@@ -679,17 +679,18 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -+ begin match Config.system with -+ "linux" | "gnu" -> -+ ` .type {emit_symbol fundecl.fun_name},@function\n`; -+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -+ | _ -> () -+ end; - if !float_constants <> [] then begin - if macosx - then ` .literal8\n` - else ` .section .rodata.cst8,\"a\",@progbits\n`; - List.iter emit_float_constant !float_constants -- end; -- match Config.system with -- "linux" | "gnu" -> -- ` .type {emit_symbol fundecl.fun_name},@function\n`; -- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ end - - (* Emission of data *) - -diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp -index 2992f29..0b1252c 100644 ---- a/asmcomp/i386/emit.mlp -+++ b/asmcomp/i386/emit.mlp -@@ -905,12 +905,12 @@ let fundecl fundecl = - emit_all true fundecl.fun_body; - List.iter emit_call_gc !call_gc_sites; - emit_call_bound_errors (); -- List.iter emit_float_constant !float_constants; -- match Config.system with -+ begin match Config.system with - "linux_elf" | "bsd_elf" | "gnu" -> - ` .type {emit_symbol fundecl.fun_name},@function\n`; - ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` -- | _ -> () -+ | _ -> () end; -+ List.iter emit_float_constant !float_constants - - - (* Emission of data *) --- |