b51d447684
are unsafe by default, which is the main motivation why it was picked,
but not the very latest one) and synchronize the rest of the stack and
dependent ports with it, particularly:
- Update `devel/ocaml-ocamlbuild' to version 0.14.0 and unbreak,
register build dependency on all ports that require it (should
be part of USE_OCAML, but we do not want to make any Mk-related
changes the for time being)
- Update `devel/ocaml-camlp4' to version 4.05+2
- Update `devel/ocaml-camlp5' to version 7.07 (the project had
moved to GitHub)
- Mark `devel/ocaml-deriving-ocsigen' as BROKEN for now, it is
very outdated and requires quite a lot of work
- Update `x11-toolkits/ocaml-labltk' to version 8.06.3
PR: 218333
Exp-run by: antoine
50 lines
1.4 KiB
Text
50 lines
1.4 KiB
Text
--- Makefile.orig 2019-06-06 15:28:32 UTC
|
|
+++ Makefile
|
|
@@ -15,9 +15,8 @@
|
|
# USA
|
|
#
|
|
CINCLUDES=-I`ocamlc -where`
|
|
-CC=gcc
|
|
CXX=g++
|
|
-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
|
|
+CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
|
|
CXXFLAGS=-O3 $(CINCLUDES) -I .
|
|
|
|
ifndef OCAMLC
|
|
@@ -135,16 +134,16 @@ keyMerge.cmx: keyMerge.ml
|
|
# Special targets
|
|
|
|
install:
|
|
- mkdir -p $(PREFIX)/bin
|
|
- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
|
|
- mkdir -p $(MANDIR)/man8
|
|
- install sks.8.gz $(MANDIR)/man8
|
|
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
+ install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
|
|
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
|
|
+ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
|
|
|
|
install.bc:
|
|
- mkdir -p $(PREFIX)/bin
|
|
- install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
|
|
- mkdir -p $(MANDIR)/man8
|
|
- install sks.8.gz $(MANDIR)/man8
|
|
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
+ install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
|
|
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
|
|
+ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
|
|
|
|
|
|
Makefile.local:
|
|
@@ -285,8 +284,9 @@ CKDIR=$(CKVER)/src
|
|
|
|
$(CKVER)/README.txt:
|
|
tar xmvfz $(CKVER).tar.gz
|
|
- patch -p 0 < $(CKVER)-sks.patch
|
|
- patch -p 0 < $(CKVER)-sks-custom_compare.patch
|
|
+ patch -p0 < $(CKVER)-sks.patch
|
|
+ patch -p0 < $(CKVER)-sks-custom_compare.patch
|
|
+ sed -i.bak -e 's,uint32,&_t,' $(CKDIR)/stubs-md5.c
|
|
|
|
$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
|
|
cd $(CKDIR) && $(MAKE) all
|