From: Stephane Glondu <steph@glondu.net>
Date: Mon, 20 Oct 2008 13:20:39 +0000 (+0200)
Subject: Remove camlrun_shared.dpatch (integrated upstream)
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~449^2~42
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4136a041e1aca20338bc6d6a54d6d5dd91899947;p=ocaml.git

Remove camlrun_shared.dpatch (integrated upstream)
---

diff --git a/debian/patches/00list b/debian/patches/00list
index f129056b..40692635 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,4 +9,3 @@ stdlib_man_section.dpatch
 install_scripts_config.dpatch
 install_ocamlbuild.dpatch
 not-native-no-aspp
-camlrun_shared.dpatch
diff --git a/debian/patches/camlrun_shared.dpatch b/debian/patches/camlrun_shared.dpatch
deleted file mode 100755
index 71f61c44..00000000
--- a/debian/patches/camlrun_shared.dpatch
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## camlrun_shared.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build and ship an alternative version of the libcamlrun.a library
-## DP: (called libcamlrun_shared.so) which is made of PIC objects
-
-@DPATCH@
-diff -urNad trunk~/byterun/Makefile trunk/byterun/Makefile
---- trunk~/byterun/Makefile	2007-02-23 10:29:45.000000000 +0100
-+++ trunk/byterun/Makefile	2007-09-28 16:01:36.000000000 +0200
-@@ -28,6 +28,7 @@
-   dynlink.o unix.o
- 
- DOBJS=$(OBJS:.o=.d.o) instrtrace.d.o
-+PICOBJS=$(OBJS:.o=.pic.o)
- 
- PRIMS=alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
-   intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \
-@@ -39,6 +40,10 @@
- 
- all: ocamlrun$(EXE) ld.conf
- 
-+ifeq ($(SUPPORTS_SHARED_LIBRARIES),true)
-+all: libcamlrun_shared.so
-+endif
-+
- ocamlrun$(EXE): libcamlrun.a prims.o
- 	$(BYTECC) $(BYTECCCOMPOPTS) $(BYTECCLINKOPTS) -o ocamlrun$(EXE) \
- 	          prims.o libcamlrun.a $(BYTECCLIBS)
-@@ -50,6 +55,9 @@
- install:
- 	cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
- 	cp libcamlrun.a $(LIBDIR)/libcamlrun.a
-+ifeq ($(SUPPORTS_SHARED_LIBRARIES),true)
-+	cp libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so
-+endif
- 	cd $(LIBDIR); $(RANLIB) libcamlrun.a
- 	if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
- 	for i in $(PUBLIC_INCLUDES); do \
-@@ -69,8 +77,12 @@
- 	ar rc libcamlrund.a $(DOBJS)
- 	$(RANLIB) libcamlrund.a
- 
-+libcamlrun_shared.so: $(PICOBJS)
-+	gcc -shared -o $@ $^
-+
- clean:
- 	rm -f ocamlrun$(EXE) ocamlrund$(EXE) *.o lib*.a
-+	rm -f lib*.so
- 	rm -f primitives prims.c opnames.h jumptbl.h ld.conf
- 	rm -f version.h
- 
-@@ -105,6 +117,7 @@
- 	echo "#define OCAML_VERSION \"`head -1 ../VERSION`\"" >version.h
- 
- .SUFFIXES: .d.o
-+.SUFFIXES: .pic.o
- 
- .c.d.o:
- 	@ if test -f $*.o; then mv $*.o $*.f.o; else :; fi
-@@ -112,6 +125,12 @@
- 	mv $*.o $*.d.o
- 	@ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi
- 
-+.c.pic.o:
-+	@ if test -f $*.o; then mv $*.o $*.f.o; else :; fi
-+	$(CC) $(CFLAGS) $(SHAREDCCCOMPOPTS) -c $<
-+	mv $*.o $*.pic.o
-+	@ if test -f $*.f.o; then mv $*.f.o $*.o; else :; fi
-+
- depend : prims.c opnames.h jumptbl.h version.h
- 	-gcc -MM $(BYTECCCOMPOPTS) *.c > .depend
- 	-gcc -MM $(BYTECCCOMPOPTS) -DDEBUG *.c | sed -e 's/\.o/.d.o/' >> .depend