Author: tbooth-guest
Date: 2013-03-18 10:17:47 +0000 (Mon, 18 Mar 2013)
New Revision: 13197
Modified:
trunk/packages/arb/trunk/debian/rules
Log:
I found an issue building for Ubuntu where the arb_edit4 binary failed to link
and was therefore missing from
the final arb binary package. This doesn't affect the current Debian package
but it might in
the future, and obviously any linking error should cause the build to fail, so
the fact that this error
was quietly swallowed is a bug in the package. This small change therefore
checks that
the binary was created and if not the build will abort. I've not committed my
other changes as they are
Ubuntu specific.
Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules 2013-03-18 05:58:49 UTC (rev
13196)
+++ trunk/packages/arb/trunk/debian/rules 2013-03-18 10:17:47 UTC (rev
13197)
@@ -25,16 +25,18 @@
mkdir -p LIBLINK MAKEBIN lib/help
export LC_ALL=C ; \
export PATH=$(ARBHOME)/bin:$${PATH} ; \
- export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
+ export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH} && \
$(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) \
CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
LDFLAGS="$(LDFLAGS)" -lm \
- all ; \
- export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
+ all && \
+ export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH} && \
$(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) ARB_64=$(ARB_64) \
CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
LDFLAGS="$(LDFLAGS)" -lm \
arbxtras
export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
cd HELP_SOURCE; $(MAKE) ARBHOME=$(ARBHOME) html
+ #Ensure arb_edit4 was actually built
+ ls bin/arb_edit4
# Remove links inside these directories because Makefile does not really clean
# these directories
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
