Branch: r14.0.x

0d475ec8 2019-05-24 14:09:35 Slávek Banko
DEB adept: Disable build with --enable-final.
Cleanup rules.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/_base/applications/adept/debian/rules
M ubuntu/_base/applications/adept/debian/rules

debian/_base/applications/adept/debian/rules

diff --git a/debian/_base/applications/adept/debian/rules b/debian/_base/applications/adept/debian/rules
index 82a27d5..e68cf45 100755
--- a/debian/_base/applications/adept/debian/rules
+++ b/debian/_base/applications/adept/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Currently is not possible to build piklab with --enable-final
+DEB_BUILD_OPTIONS += noopt
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-tde.mk
 
@@ -19,23 +22,3 @@
 # Enable us to locate the old libept-trinity library and includes
 CPPFLAGS += -I/opt/trinity/include
 LDFLAGS += -L/opt/trinity/lib -lept
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-# Store build information
-common-binary-post-install-arch common-binary-post-install-indep::

ubuntu/_base/applications/adept/debian/rules

diff --git a/ubuntu/_base/applications/adept/debian/rules b/ubuntu/_base/applications/adept/debian/rules
index 82a27d5..e68cf45 100755
--- a/ubuntu/_base/applications/adept/debian/rules
+++ b/ubuntu/_base/applications/adept/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Currently is not possible to build piklab with --enable-final
+DEB_BUILD_OPTIONS += noopt
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/debian-tde.mk
 
@@ -19,23 +22,3 @@
 # Enable us to locate the old libept-trinity library and includes
 CPPFLAGS += -I/opt/trinity/include
 LDFLAGS += -L/opt/trinity/lib -lept
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-# Store build information
-common-binary-post-install-arch common-binary-post-install-indep::