The following commit has been merged in the debian-experimental-4.1 branch:
commit c0580eaa6747ef18e21431d20bee33d68851712a
Author: Rene Engelhard <[email protected]>
Date: Mon Mar 11 18:39:40 2013 +0100
git update; set MARIADBCONFIG for autogen.sh and remove ln -sf hack
diff --git a/changelog b/changelog
index 2f9df29..b700812 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130310-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130311-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 486cd7c..d45b2e7 100755
--- a/rules
+++ b/rules
@@ -1035,10 +1035,12 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
else
BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
endif
+ MARIADBCONFIG=/usr/bin/mysql_config
else
ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmariadbclient-dev
endif
+ MARIADBCONFIG=/usr/bin/mariadb_config
endif
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
@@ -1609,12 +1611,6 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
endif
endif
-ifeq "$(USE_MARIADB)" "n"
- # MARIADBCONFIG=mysql_config for autogen.sh somehow doesn't work...
- mkdir -p debian/usr/bin && \
- cd debian/usr/bin && ln -sf /usr/bin/mysql_config mariadb_config
-endif
-
touch $@
build:
@@ -1632,6 +1628,7 @@ $(STAMP_DIR)/build-arch:
# somehow...
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags
python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs
python-$(PYMAJOR).$(PYMINOR))" \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
./autogen.sh $(CONFIGURE_FLAGS) \
--without-doxygen --disable-ext-wiki-publisher \
--disable-ext-report-builder --disable-scripting-javascript \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
