[Pkg-ocaml-maint-commits] r4578 - in /trunk/packages/cothreads/trunk/debian: patches/40_non_native_arch.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Wed Sep 26 01:37:08 UTC 2007 

Author: gildor
Date: Wed Sep 26 01:37:08 2007
New Revision: 4578

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4578
Log:
* Allow compilation on non native arch

Modified:
    trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch
    trunk/packages/cothreads/trunk/debian/rules

Modified: trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch?rev=4578&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch (original)
+++ trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch Wed Sep 26 01:37:08 2007
@@ -6,40 +6,36 @@
 
 @DPATCH@
 diff -urNad cothreads-0.10~/doc/Makefile cothreads-0.10/doc/Makefile
---- cothreads-0.10~/doc/Makefile	2007-09-26 03:01:12.204551084 +0200
-+++ cothreads-0.10/doc/Makefile	2007-09-26 03:02:55.560049201 +0200
-@@ -10,4 +10,4 @@
- 	$(OCAMLDOC) -man -d man -man-mini $(TOPDIR)/$(SOURCEDIR)/*.mli $(TOPDIR)/$(SOURCEDIR)/process/thread.mli
+--- cothreads-0.10~/doc/Makefile	2007-09-26 03:28:33.000000000 +0200
++++ cothreads-0.10/doc/Makefile	2007-09-26 03:28:33.089078641 +0200
+@@ -11,3 +11,4 @@
  
  clean: 
--	$(RM) html man *~ .depend
-\ No newline at end of file
-+	$(RM) html man *~ .depend
+ 	$(RM) html man *~ .depend
++
 diff -urNad cothreads-0.10~/example/Makefile cothreads-0.10/example/Makefile
---- cothreads-0.10~/example/Makefile	2007-09-26 03:01:12.216550562 +0200
-+++ cothreads-0.10/example/Makefile	2007-09-26 03:02:50.712260358 +0200
-@@ -13,14 +13,18 @@
+--- cothreads-0.10~/example/Makefile	2007-09-26 03:28:33.000000000 +0200
++++ cothreads-0.10/example/Makefile	2007-09-26 03:28:33.089078641 +0200
+@@ -15,12 +15,16 @@
+ 	$(OCAMLC) -o $@ $(VMPARAM) $< 
  %.nath: %.cmo
  	$(OCAMLC) -o $@ $(NATHPARAM) $<
- 
 +ifeq ($(NATIVE),yes)
  %.nath.opt: %.cmx
  	$(OCAMLOPT) -o $@ $(NATHOPTPARAM) $<
 +endif
- 
  %.proc: %.cmo
  	$(OCAMLC) -o $@ $(PROCPARAM)  $<
- 
 +ifeq ($(NATIVE),yes)
  %.proc.opt: %.cmx
  	$(OCAMLOPT) -o $@ $(PROCOPTPARAM)  $<
 +endif
  
  ALLTEST = coth evt lock ray_col ray_nocol test mvar merge mcast phil santa
- 
+ all: $(ALLTEST:%=%.vmth) $(ALLTEST:%=%.nath) $(ALLTEST:%=%.nath.opt) $(ALLTEST:%=%.proc) $(ALLTEST:%=%.proc.opt) 
 diff -urNad cothreads-0.10~/src/Makefile cothreads-0.10/src/Makefile
---- cothreads-0.10~/src/Makefile	2007-09-11 22:32:40.000000000 +0200
-+++ cothreads-0.10/src/Makefile	2007-09-26 03:04:47.947153926 +0200
+--- cothreads-0.10~/src/Makefile	2007-09-26 03:28:32.000000000 +0200
++++ cothreads-0.10/src/Makefile	2007-09-26 03:28:33.089078641 +0200
 @@ -4,7 +4,9 @@
  
  AUXMOD = libext libextunix
@@ -51,9 +47,9 @@
  COMMONMOD = mutex condition event
  COMMONMODINTFSRC = $(COMMONMOD:%=%.mli)
 diff -urNad cothreads-0.10~/src/process/Makefile cothreads-0.10/src/process/Makefile
---- cothreads-0.10~/src/process/Makefile	2007-09-11 22:32:40.000000000 +0200
-+++ cothreads-0.10/src/process/Makefile	2007-09-26 03:05:18.817809285 +0200
-@@ -6,23 +6,33 @@
+--- cothreads-0.10~/src/process/Makefile	2007-09-26 03:28:32.000000000 +0200
++++ cothreads-0.10/src/process/Makefile	2007-09-26 03:30:28.124068031 +0200
+@@ -6,24 +6,34 @@
  
  AUXMOD = libext libextunix
  AUXMODBYT = $(AUXMOD:%=%.cmo)
@@ -83,14 +79,15 @@
  LIBBYT = $(LIB:%=%.cma)
 +ifeq ($(NATIVE),yes)
  LIBNAT = $(LIB:%=%.cmxa)
+ LIBNATA = $(LIB:%=%.a)
 +endif
- LIBNATA = $(LIB:%=%.a)
  
  INSTALLDIR = $(INSTALLLIBDIR)/$(BACKEND)
+ INSTALLFILES = $(COMMONMODINTFCOM) $(EXTRAMODINTFCOM) $(COMMONMODNAT) $(EXTRAMODNAT) $(LIBBYT) $(LIBNAT) $(LIBNATA)
 diff -urNad cothreads-0.10~/src/threads/Makefile cothreads-0.10/src/threads/Makefile
---- cothreads-0.10~/src/threads/Makefile	2007-09-11 22:32:40.000000000 +0200
-+++ cothreads-0.10/src/threads/Makefile	2007-09-26 03:03:55.497438493 +0200
-@@ -6,7 +6,9 @@
+--- cothreads-0.10~/src/threads/Makefile	2007-09-26 03:28:32.000000000 +0200
++++ cothreads-0.10/src/threads/Makefile	2007-09-26 03:31:37.565043372 +0200
+@@ -6,23 +6,31 @@
  
  AUXMOD = libext
  AUXMODBYT = $(AUXMOD:%=%.cmo)
@@ -99,8 +96,10 @@
 +endif
  
  COMMONMOD = thread mutex condition event
++ifeq ($(NATIVE),yes)
  COMMONMODNAT =  $(COMMONMOD:%=%.cmx)
-@@ -14,14 +16,18 @@
+ COMMONMODNATA = $(COMMONMOD:%=%.o)
++endif
  
  EXTRAMOD = cothread stm
  EXTRAMODBYT = $(EXTRAMOD:%=%.cmo)
@@ -115,11 +114,12 @@
  LIBBYT = $(LIB:%=%.cma)
 +ifeq ($(NATIVE),yes)
  LIBNAT = $(LIB:%=%.cmxa)
+ LIBNATA = $(LIB:%=%.a)
 +endif
- LIBNATA = $(LIB:%=%.a)
  
  INSTALLDIR = $(INSTALLLIBDIR)/$(BACKEND)
-@@ -52,4 +58,4 @@
+ INSTALLFILES = $(EXTRAMODINTFCOM) $(EXTRAMODNAT) $(LIBBYT) $(LIBNAT) $(LIBNATA)
+@@ -52,4 +60,4 @@
  clean: ocamlclean
  
  uninstall:

Modified: trunk/packages/cothreads/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/rules?rev=4578&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/rules (original)
+++ trunk/packages/cothreads/trunk/debian/rules Wed Sep 26 01:37:08 2007
@@ -33,8 +33,10 @@
 DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
 DEB_MAKE_CLEAN_TARGET    := clean
-DEB_MAKE_BUILD_TARGET    := all doc \
-                            NATIVE=yes 
+DEB_MAKE_BUILD_TARGET    := all doc 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET    += NATIVE=yes
+endif
 DEB_MAKE_INSTALL_TARGET  := install \
                             DESTDIR='$(DESTDIR_DEV)'

More information about the Pkg-ocaml-maint-commits mailing list