diff options
| author | Simon Legner | 2015-06-12 11:02:43 +0200 |
|---|---|---|
| committer | Simon Legner | 2015-06-12 11:02:43 +0200 |
| commit | e23565c983c21f60787b6ba027c08ff81564246a (patch) | |
| tree | 439f984577ae6e0259192079c1850f35f26abc91 /arch-build-system-fix.patch | |
| download | aur-e23565c983c21f60787b6ba027c08ff81564246a.tar.gz | |
Initial import
Diffstat (limited to 'arch-build-system-fix.patch')
| -rw-r--r-- | arch-build-system-fix.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/arch-build-system-fix.patch b/arch-build-system-fix.patch new file mode 100644 index 000000000000..10fae0f1f917 --- /dev/null +++ b/arch-build-system-fix.patch @@ -0,0 +1,58 @@ +diff -Nur camlidl-1.05.orig/config/Makefile.unix camlidl-1.05/config/Makefile.unix +--- camlidl-1.05.orig/config/Makefile.unix 2013-10-02 11:39:13.596586957 +0200 ++++ camlidl-1.05/config/Makefile.unix 2013-10-02 11:40:06.050112149 +0200 +@@ -19,7 +19,7 @@ + + # How to invoke the C preprocessor + # Works on most Unix systems: +-CPP=/lib/cpp ++CPP=$(shell which cpp) + # Alternatives: + # CPP=cpp + # CPP=/usr/ccs/lib/cpp +@@ -31,10 +31,12 @@ + #RANLIB=: + + # Location of the Objective Caml library in your installation +-OCAMLLIB=/usr/local/lib/ocaml ++OCAMLBASEDIR=$(shell ocamlc -where) ++OCAMLLIB=$(DESTDIR)$(OCAMLBASEDIR)/camlidl ++OCAMLINCDIR=$(DESTDIR)$(OCAMLBASEDIR)/caml + + # Where to install the binaries +-BINDIR=/usr/local/bin ++BINDIR=$(DESTDIR)/usr/bin + + # The Objective Caml compilers (the defaults below should be OK) + OCAMLC=ocamlc -g +diff -Nur camlidl-1.05.orig/lib/Makefile camlidl-1.05/lib/Makefile +--- camlidl-1.05.orig/lib/Makefile 2013-10-02 11:39:13.596586957 +0200 ++++ camlidl-1.05/lib/Makefile 2013-10-02 11:40:33.639866581 +0200 +@@ -29,8 +29,14 @@ + $(OCAMLOPT) -a -o $(NATIVELIB) $(NATIVEOBJS) + + install: +- cp $(INTERFACES) $(BYTELIB) $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(OCAMLLIB) +- cd $(OCAMLLIB); $(RANLIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) ++ cp $(INTERFACES) $(BYTELIB) $(OCAMLLIB) ++ if [ -x /usr/bin/ocamlopt ]; then \ ++ cp $(NATIVELIB) $(NATIVELIB:.cmxa=.$(LIBEXT)) $(OCAMLLIB); \ ++ cd $(OCAMLLIB); \ ++ $(RANLIB) $(NATIVELIB:.cmxa=.$(LIBEXT)); \ ++ else \ ++ true; \ ++ fi + + .SUFFIXES: .mli .ml .cmi .cmo .cmx + +diff -Nur camlidl-1.05.orig/runtime/Makefile.unix camlidl-1.05/runtime/Makefile.unix +--- camlidl-1.05.orig/runtime/Makefile.unix 2013-10-02 11:39:13.596586957 +0200 ++++ camlidl-1.05/runtime/Makefile.unix 2013-10-02 11:39:21.178020877 +0200 +@@ -22,7 +22,7 @@ + $(RANLIB) $@ + + install: +- cp camlidlruntime.h $(OCAMLLIB)/caml/camlidlruntime.h ++ cp camlidlruntime.h $(OCAMLINCDIR)/camlidlruntime.h + cp libcamlidl.a $(OCAMLLIB)/libcamlidl.a + cd $(OCAMLLIB); $(RANLIB) libcamlidl.a |