The following commit has been merged in the master branch:
commit e490e91d9dcae13e8dfcd1a49badb033ee6907ad
Author: Romain Beauxis <to...@rastageeks.org>
Date:   Sat May 28 00:59:31 2011 -0500

    Fixed bytecode compilation (except dependencies..)

diff --git a/debian/changelog b/debian/changelog
index 8da1542..d973682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+liquidsoap (1.0.0~beta1+20110527~hgac5e0ed299ff-1) experimental; urgency=low
+
+  * New snapshot from latest mercurial code.
+  * Fix compilation in bytecode.
+  * Disable liquidsoap-plugin-alsa for BSD architectures. 
+  * Compile in bytecode on armel since dynlink.cmxa is not
+    available.
+
+ -- Romain Beauxis <toots@leroy>  Fri, 27 May 2011 23:39:06 -0500
+
 liquidsoap (1.0.0~beta1+20110525~hgbcdbe01d2de5-1) experimental; urgency=low
 
   * Snapshot from mercurial repository.
diff --git a/debian/control b/debian/control
index 995bdd9..ae116c0 100644
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,7 @@ Description: audio streaming language -- SDL plugin
  This package provides SDL support for liquidsoap.
 
 Package: liquidsoap-plugin-alsa
-Architecture: any
+Architecture: [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64]
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 675f6e9..e109b91 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -108,7 +108,7 @@ Description: audio streaming language -- SDL plugin
  This package provides SDL support for liquidsoap.
 
 Package: liquidsoap-plugin-alsa
-Architecture: any
+Architecture: [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64]
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/liquidsoap-plugin-alsa.install 
b/debian/liquidsoap-plugin-alsa.install
index 827d6d1..8080fb1 100644
--- a/debian/liquidsoap-plugin-alsa.install
+++ b/debian/liquidsoap-plugin-alsa.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/alsa.cm*
+usr/lib/liquidsoap/*/plugins/alsa.cm*
diff --git a/debian/liquidsoap-plugin-ao.install 
b/debian/liquidsoap-plugin-ao.install
index 210614d..0607553 100644
--- a/debian/liquidsoap-plugin-ao.install
+++ b/debian/liquidsoap-plugin-ao.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/ao.cm*
+usr/lib/liquidsoap/*/plugins/ao.cm*
diff --git a/debian/liquidsoap-plugin-faad.install 
b/debian/liquidsoap-plugin-faad.install
index 049b5cd..688c0d0 100644
--- a/debian/liquidsoap-plugin-faad.install
+++ b/debian/liquidsoap-plugin-faad.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/faad.cm*
+usr/lib/liquidsoap/*/plugins/faad.cm*
diff --git a/debian/liquidsoap-plugin-flac.install 
b/debian/liquidsoap-plugin-flac.install
index f3576f7..5acdb71 100644
--- a/debian/liquidsoap-plugin-flac.install
+++ b/debian/liquidsoap-plugin-flac.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/flac.cm*
-debian/tmp/usr/lib/liquidsoap/*/plugins/flac_ogg.cm*
+usr/lib/liquidsoap/*/plugins/flac.cm*
+usr/lib/liquidsoap/*/plugins/flac_ogg.cm*
diff --git a/debian/liquidsoap-plugin-gavl.install 
b/debian/liquidsoap-plugin-gavl.install
index c9e5a4b..448cf2b 100644
--- a/debian/liquidsoap-plugin-gavl.install
+++ b/debian/liquidsoap-plugin-gavl.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/gavl.cm*
+usr/lib/liquidsoap/*/plugins/gavl.cm*
diff --git a/debian/liquidsoap-plugin-graphics.install 
b/debian/liquidsoap-plugin-graphics.install
index 81069d1..5a7dc35 100644
--- a/debian/liquidsoap-plugin-graphics.install
+++ b/debian/liquidsoap-plugin-graphics.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/graphics.cm*
+usr/lib/liquidsoap/*/plugins/graphics.cm*
diff --git a/debian/liquidsoap-plugin-icecast.install 
b/debian/liquidsoap-plugin-icecast.install
index db0ff4b..8b1d3d5 100644
--- a/debian/liquidsoap-plugin-icecast.install
+++ b/debian/liquidsoap-plugin-icecast.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/cry.cm*
+usr/lib/liquidsoap/*/plugins/cry.cm*
diff --git a/debian/liquidsoap-plugin-jack.install 
b/debian/liquidsoap-plugin-jack.install
index dd3f9ec..395e2f6 100644
--- a/debian/liquidsoap-plugin-jack.install
+++ b/debian/liquidsoap-plugin-jack.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/bjack.cm*
+usr/lib/liquidsoap/*/plugins/bjack.cm*
diff --git a/debian/liquidsoap-plugin-ladspa.install 
b/debian/liquidsoap-plugin-ladspa.install
index e7d11ff..950c6d9 100644
--- a/debian/liquidsoap-plugin-ladspa.install
+++ b/debian/liquidsoap-plugin-ladspa.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/ladspa.cm*
+usr/lib/liquidsoap/*/plugins/ladspa.cm*
diff --git a/debian/liquidsoap-plugin-lastfm.install 
b/debian/liquidsoap-plugin-lastfm.install
index 77853a1..6a25545 100644
--- a/debian/liquidsoap-plugin-lastfm.install
+++ b/debian/liquidsoap-plugin-lastfm.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/lastfm.cm*
+usr/lib/liquidsoap/*/plugins/lastfm.cm*
diff --git a/debian/liquidsoap-plugin-mad.install 
b/debian/liquidsoap-plugin-mad.install
index bb441b2..323e928 100644
--- a/debian/liquidsoap-plugin-mad.install
+++ b/debian/liquidsoap-plugin-mad.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/mad.cm*
+usr/lib/liquidsoap/*/plugins/mad.cm*
diff --git a/debian/liquidsoap-plugin-ogg.install 
b/debian/liquidsoap-plugin-ogg.install
index cd6606e..47cc378 100644
--- a/debian/liquidsoap-plugin-ogg.install
+++ b/debian/liquidsoap-plugin-ogg.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/ogg.cm*
+usr/lib/liquidsoap/*/plugins/ogg.cm*
diff --git a/debian/liquidsoap-plugin-oss.install.in 
b/debian/liquidsoap-plugin-oss.install.in
index 706182e..fc75d92 100644
--- a/debian/liquidsoap-plugin-oss.install.in
+++ b/debian/liquidsoap-plugin-oss.install.in
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/oss.cm*
-BYTE: debian/tmp/usr/lib/liquidsoap/*/plugins/dllliquidsoap_oss.so 
@OCamlDllDir@
+usr/lib/liquidsoap/*/plugins/oss.cm*
+BYTE: @OCamlStdlibDir@/liquidsoap/dllliquidsoap_oss.so @OCamlDllDir@
diff --git a/debian/liquidsoap-plugin-portaudio.install 
b/debian/liquidsoap-plugin-portaudio.install
index 6974e43..e874343 100644
--- a/debian/liquidsoap-plugin-portaudio.install
+++ b/debian/liquidsoap-plugin-portaudio.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/portaudio.cm*
+usr/lib/liquidsoap/*/plugins/portaudio.cm*
diff --git a/debian/liquidsoap-plugin-pulseaudio.install 
b/debian/liquidsoap-plugin-pulseaudio.install
index fe1d1ca..756c7db 100644
--- a/debian/liquidsoap-plugin-pulseaudio.install
+++ b/debian/liquidsoap-plugin-pulseaudio.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/pulseaudio.cm*
+usr/lib/liquidsoap/*/plugins/pulseaudio.cm*
diff --git a/debian/liquidsoap-plugin-samplerate.install 
b/debian/liquidsoap-plugin-samplerate.install
index f50862d..1cfce10 100644
--- a/debian/liquidsoap-plugin-samplerate.install
+++ b/debian/liquidsoap-plugin-samplerate.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/samplerate.cm*
+usr/lib/liquidsoap/*/plugins/samplerate.cm*
diff --git a/debian/liquidsoap-plugin-schroedinger.install 
b/debian/liquidsoap-plugin-schroedinger.install
index 76ce98f..27dff25 100644
--- a/debian/liquidsoap-plugin-schroedinger.install
+++ b/debian/liquidsoap-plugin-schroedinger.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/schroedinger.cm*
+usr/lib/liquidsoap/*/plugins/schroedinger.cm*
diff --git a/debian/liquidsoap-plugin-sdl.install 
b/debian/liquidsoap-plugin-sdl.install
index 6b5b186..5d213b6 100644
--- a/debian/liquidsoap-plugin-sdl.install
+++ b/debian/liquidsoap-plugin-sdl.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/sdl.cm*
+usr/lib/liquidsoap/*/plugins/sdl.cm*
diff --git a/debian/liquidsoap-plugin-soundtouch.install 
b/debian/liquidsoap-plugin-soundtouch.install
index 567c5a6..e35888b 100644
--- a/debian/liquidsoap-plugin-soundtouch.install
+++ b/debian/liquidsoap-plugin-soundtouch.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/soundtouch.cm*
+usr/lib/liquidsoap/*/plugins/soundtouch.cm*
diff --git a/debian/liquidsoap-plugin-speex.install 
b/debian/liquidsoap-plugin-speex.install
index 7ce3441..ac28b8c 100644
--- a/debian/liquidsoap-plugin-speex.install
+++ b/debian/liquidsoap-plugin-speex.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/speex.cm*
+usr/lib/liquidsoap/*/plugins/speex.cm*
diff --git a/debian/liquidsoap-plugin-taglib.install 
b/debian/liquidsoap-plugin-taglib.install
index c81d6cf..e06a873 100644
--- a/debian/liquidsoap-plugin-taglib.install
+++ b/debian/liquidsoap-plugin-taglib.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/taglib.cm*
+usr/lib/liquidsoap/*/plugins/taglib.cm*
diff --git a/debian/liquidsoap-plugin-theora.install 
b/debian/liquidsoap-plugin-theora.install
index ed6db1e..7b85b21 100644
--- a/debian/liquidsoap-plugin-theora.install
+++ b/debian/liquidsoap-plugin-theora.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/theora.cm*
+usr/lib/liquidsoap/*/plugins/theora.cm*
diff --git a/debian/liquidsoap-plugin-voaacenc.install 
b/debian/liquidsoap-plugin-voaacenc.install
index 4d00dc6..a3d6948 100644
--- a/debian/liquidsoap-plugin-voaacenc.install
+++ b/debian/liquidsoap-plugin-voaacenc.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/voaacenc.cm*
+usr/lib/liquidsoap/*/plugins/voaacenc.cm*
diff --git a/debian/liquidsoap-plugin-vorbis.install 
b/debian/liquidsoap-plugin-vorbis.install
index 502b6f2..d8c70a6 100644
--- a/debian/liquidsoap-plugin-vorbis.install
+++ b/debian/liquidsoap-plugin-vorbis.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/vorbis.cm*
+usr/lib/liquidsoap/*/plugins/vorbis.cm*
diff --git a/debian/liquidsoap-plugin-xmlplaylist.install 
b/debian/liquidsoap-plugin-xmlplaylist.install
index 24f3c3f..884b7c5 100644
--- a/debian/liquidsoap-plugin-xmlplaylist.install
+++ b/debian/liquidsoap-plugin-xmlplaylist.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liquidsoap/*/plugins/xmlplaylist.cm*
+usr/lib/liquidsoap/*/plugins/xmlplaylist.cm*
diff --git a/debian/liquidsoap.install b/debian/liquidsoap.install.in
similarity index 69%
rename from debian/liquidsoap.install
rename to debian/liquidsoap.install.in
index 9c80cd8..51fa2f8 100644
--- a/debian/liquidsoap.install
+++ b/debian/liquidsoap.install.in
@@ -2,3 +2,4 @@ debian/tmp/usr/bin/liquidsoap
 debian/tmp/usr/lib/liquidsoap
 debian/tmp/etc/logrotate.d/liquidsoap
 examples/radio.liq               etc/liquidsoap
+BYTE: @OCamlStdlibDir@/liquidsoap/dllliquidsoap.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 97bcd8b..c758acb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,11 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
   --enable-portaudio-plugin --enable-pulseaudio-plugin --enable-ao-plugin \
   --enable-graphics-plugin --enable-bjack-plugin --enable-soundtouch-plugin \
   --enable-ladspa-plugin --enable-oss-plugin --enable-alsa-plugin \
-  --enable-flac.ogg-plugin --enable-samplerate-plugin
+  --enable-flac.ogg-plugin --enable-samplerate-plugin --disable-custom
 DEB_MAKE_BUILD_TARGET := all doc
-DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/ 
DEBIAN=yes prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc
+DEB_MAKE_INSTALL_TARGET := doc install DESTDIR=$(CURDIR)/debian/tmp/ 
OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) \
+                                      prefix=$(CURDIR)/debian/tmp/usr 
sysconfdir=$(CURDIR)/debian/tmp/etc \
+                                      OCAMLFIND_LDCONF=ignore
 DEB_INSTALL_MANPAGES_liquidsoap := doc/liquidsoap.1
 DEB_COMPRESS_EXCLUDE := .pdf
 DEB_DH_INSTALL_ARGS_liquidsoap := -Xplugins
@@ -34,9 +36,16 @@ OCAML_DHOCAML_FLAGS := \
   -Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora 
-Nliquidsoap-plugin-voaacenc \
   -Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist
 
+# Compile in bytecode on armel..
+ifeq ($(DEB_HOST_ARCH),armel)
+  DEB_CONFIGURE_EXTRA_FLAGS += --disable-nativecode
+  export OCAMLINIT_SED := " -e '/^OPT: /d' -e 's/^BYTE: //'"
+endif
+
 makebuilddir/liquidsoap::
        [ ! -f src/configure.ml ] || [ -f src/configure.ml.cdbs-backup ] || \
        cp -f src/configure.ml src/configure.ml.cdbs-backup
+       mkdir -p $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 install/liquidsoap::
        cp $(CURDIR)/scripts/liquidsoap.initd $(CURDIR)/debian/liquidsoap.init
@@ -46,9 +55,6 @@ binary-install/liquidsoap::
        mv $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq 
$(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq.example
        chmod +x $(CURDIR)/debian/liquidsoap/etc/liquidsoap/radio.liq.example
        chmod -x 
$(CURDIR)/debian/liquidsoap/usr/share/doc/liquidsoap/examples/*.liq
-       [ ! -f $(CURDIR)/src/dllliquidsoap.so ] || \
-         (mkdir -p $(CURDIR)/debian/liquidsoap$(OCAML_DLL_DIR); \
-          cp $(CURDIR)/src/dllliquidsoap.so 
$(CURDIR)/debian/liquidsoap$(OCAML_DLL_DIR))
 
 binary-install/liguidsoap::
        sed -e 
s#/usr/lib/python.*/site-packages/liquidsoap#/var/lib/liguidsoap#g -i 
$(CURDIR)/debian/liguidsoap/usr/bin/liguidsoap

-- 
liquidsoap packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to