The following commit has been merged in the master branch: commit 9e94a60e4d297deb0ee81dcd044399f7adfc001f Author: Romain Beauxis <to...@rastageeks.org> Date: Fri Jun 24 14:25:21 2011 -0500
Fixed bytecode compilation.. diff --git a/debian/changelog b/debian/changelog index 3bb8065..3519f2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +liquidsoap (1.0.0~beta1+20110527~hgac5e0ed299ff-3) experimental; urgency=low + + * Fixed bytecode compilation for real: needed to pass --disable-custom + to configure script. + + -- Romain Beauxis <to...@rastageeks.org> Fri, 24 Jun 2011 14:20:21 -0500 + +liquidsoap (1.0.0~beta1+20110527~hgac5e0ed299ff-2) experimental; urgency=low + + * Do not try to install dllliquidsoap.so on non-native archs: it + seems that with the recent patch on ocamlc, this is not needed + anymore.. + + -- Romain Beauxis <to...@rastageeks.org> Fri, 24 Jun 2011 11:08:28 -0500 + liquidsoap (1.0.0~beta1+20110527~hgac5e0ed299ff-1) experimental; urgency=low * New snapshot from latest mercurial code. diff --git a/debian/rules b/debian/rules index 154564e..cdd63c2 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ 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/ OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) \ prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc \ @@ -26,17 +26,17 @@ ifeq ($(OCAML_NATDYNLINK),no) DEB_CONFIGURE_EXTRA_FLAGS += --disable-nativecode export OCAMLINIT_SED := -e 's/^NODYN: //' else -OCAML_DHOCAML_FLAGS := \ - -Nliquidsoap-plugin-sdl -Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \ - -Nliquidsoap-plugin-jack -Nliquidsoap-plugin-icecast -Nliquidsoap-plugin-faad \ - -Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl -Nliquidsoap-plugin-graphics \ - -Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm -Nliquidsoap-plugin-mad \ - -Nliquidsoap-plugin-ogg -Nliquidsoap-plugin-oss -Nliquidsoap-plugin-portaudio \ - -Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate \ - -Nliquidsoap-plugin-schroedinger -Nliquidsoap-plugin-soundtouch -Nliquidsoap-plugin-speex \ - -Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora -Nliquidsoap-plugin-voaacenc \ - -Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist - export OCAMLINIT_SED := -e '/^NODYN: /d' + OCAML_DHOCAML_FLAGS := \ + -Nliquidsoap-plugin-sdl -Nliquidsoap-plugin-alsa -Nliquidsoap-plugin-ao \ + -Nliquidsoap-plugin-jack -Nliquidsoap-plugin-icecast -Nliquidsoap-plugin-faad \ + -Nliquidsoap-plugin-flac -Nliquidsoap-plugin-gavl -Nliquidsoap-plugin-graphics \ + -Nliquidsoap-plugin-ladspa -Nliquidsoap-plugin-lastfm -Nliquidsoap-plugin-mad \ + -Nliquidsoap-plugin-ogg -Nliquidsoap-plugin-oss -Nliquidsoap-plugin-portaudio \ + -Nliquidsoap-plugin-pulseaudio -Nliquidsoap-plugin-samplerate \ + -Nliquidsoap-plugin-schroedinger -Nliquidsoap-plugin-soundtouch -Nliquidsoap-plugin-speex \ + -Nliquidsoap-plugin-taglib -Nliquidsoap-plugin-theora -Nliquidsoap-plugin-voaacenc \ + -Nliquidsoap-plugin-vorbis -Nliquidsoap-plugin-xmlplaylist + export OCAMLINIT_SED := -e '/^NODYN: /d' endif makebuilddir/liquidsoap:: -- 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