Commits

camlspotter committed 61eb8fe

ocaml 4 fix

  • Participants
  • Parent commits 67ddea5

Comments (0)

Files changed (3)

File curl/ocurl-0.5.3~oasis4/config.log

 
 hostname = ubuntu
 uname -m = i686
-uname -r = 3.0.0-16-generic
+uname -r = 3.2.0-24-generic
 uname -s = Linux
-uname -v = #29-Ubuntu SMP Tue Feb 14 12:49:42 UTC 2012
+uname -v = #39-Ubuntu SMP Mon May 21 16:51:22 UTC 2012
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
 configure:1738: result: gcc
 configure:1976: checking for C compiler version
 configure:1983: gcc --version >&5
-gcc (Ubuntu/Linaro 4.6.1-9ubuntu3) 4.6.1
+gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
 Copyright (C) 2011 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 configure:1993: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/i686-linux-gnu/4.6.1/lto-wrapper
+COLLECT_LTO_WRAPPER=/usr/lib/gcc/i686-linux-gnu/4.6/lto-wrapper
 Target: i686-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.6.1-9ubuntu3' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++,go --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-plugin --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Ubuntu/Linaro 4.6.3-1ubuntu5' --with-bugurl=file:///usr/share/doc/gcc-4.6/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.6 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.6 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i686 --with-tune=generic --enable-checking=release --build=i686-linux-gnu --host=i686-linux-gnu --target=i686-linux-gnu
 Thread model: posix
-gcc version 4.6.1 (Ubuntu/Linaro 4.6.1-9ubuntu3) 
+gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) 
 configure:1996: $? = 0
 configure:2003: gcc -V >&5
 gcc: error: unrecognized option '-V'
 configure:2696: checking for ocamlc
 configure:2712: found /home/jun/.share/prefix/bin/ocamlc
 configure:2726: result: ocamlc
-configure:2735: result: OCaml version is 3.12.1+ocamlspotter-1.4.0+camlp4-lexer-plug+poormans-overloading
+configure:2735: result: OCaml version is 4.00.0+beta2+camlp4-lexer-plug
 configure:2738: result: OCaml library path is /home/jun/.share/prefix/lib/ocaml
 configure:2743: checking for ocamlopt
 configure:2759: found /home/jun/.share/prefix/bin/ocamlopt
 CPPFLAGS=''
 CURLDIR=''
 CURLFLAGS='-L/usr/lib/i386-linux-gnu'
-CURLLIBS='-lcurl -Wl,-Bsymbolic-functions'
+CURLLIBS='-lcurl -Wl,-Bsymbolic-functions -Wl,-z,relro'
 DEFS='-DHAVE_CONFIG_H'
 ECHO_C=''
 ECHO_N='-n'
 OCAMLMKTOP='ocamlmktop'
 OCAMLOPT='ocamlopt.opt'
 OCAMLOPTDOTOPT='ocamlopt.opt'
-OCAMLVERSION='3.12.1+ocamlspotter-1.4.0+camlp4-lexer-plug+poormans-overloading'
+OCAMLVERSION='4.00.0+beta2+camlp4-lexer-plug'
 PACKAGE_BUGREPORT=''
 PACKAGE_NAME=''
 PACKAGE_STRING=''

File curl/ocurl-0.5.3~oasis4/config.status

 s,@OCAMLMKLIB@,|#_!!_#|ocamlmklib,g
 s,@OCAMLDOC@,|#_!!_#|ocamldoc,g
 s,@OCAMLBEST@,|#_!!_#|opt,g
-s,@OCAMLVERSION@,|#_!!_#|3.12.1+ocamlspotter-1.4.0+camlp4-lexer-plug+poormans-overloading,g
+s,@OCAMLVERSION@,|#_!!_#|4.00.0+beta2+camlp4-lexer-plug,g
 s,@OCAMLLIB@,|#_!!_#|/home/jun/.share/prefix/lib/ocaml,g
 s,@OCAMLFIND@,|#_!!_#|ocamlfind,g
 s,@ac_prefix_program@,|#_!!_#|/home/jun/.share/prefix/bin/ocamlc,g
 s,@CURLDIR@,|#_!!_#|,g
 s,@CURLFLAGS@,|#_!!_#|-L/usr/lib/i386-linux-gnu,g
-s,@CURLLIBS@,|#_!!_#|-lcurl -Wl\,-Bsymbolic-functions,g
+s,@CURLLIBS@,|#_!!_#|-lcurl -Wl\,-Bsymbolic-functions -Wl\,-z\,relro,g
 s,@INSTALLDIR@,|#_!!_#|/home/jun/.share/prefix/lib/ocaml/curl,g
 s,@LIBOBJS@,|#_!!_#|,g
 s,@LTLIBOBJS@,|#_!!_#|,g

File xml-light/OMakefile

 targets[]= META xml-light.cma xml-light.cmxa xml-light.a \
 	$(addsuffix .cmi, $(MODULES)) \
 	$(addsuffix .mli, $(MODULES)) \
-	$(addsuffix .spit, $(MODULES)) \
-	$(addsuffix .spot, $(MODULES)) 
+	$(addsuffix .cmti, $(MODULES)) \
+	$(addsuffix .cmt, $(MODULES)) 
 
 $(Installed xml-light): $(sources)
     ocamlfind remove xml-light